Cleaning up code

And making sure that caption tracks still load for the Transcript if
captions are not enabled
Annotations