main.cpp cleanup and behaviour change for VideoDevice.