Removed component-specific code from master branch

Anything specific to one video player component should go onto that
component's branch.