Cleanup video-class, fixes #709