Improvements to the VideoClip playing logic

Removed some commented code, changed how video clip is played.