Video code cleanups