(GX) Video cleanups