Remove stream link and use edit-media instead. Revise section 3.2.12 accordingly.
stream is uplicating edit-media, remove it.