More VideoPlayer cleanup