Removing diagnostic code
Adding YouTube and Brightcove parameter switches