Clean up
Reconfigure video route and submission controller
mend
Pre merge