source intend cleanup
Clean up, fixed youtube videos without api access
Last pre 1.6 changes