Fix issue from #567 that stopped videos from working. Clean up some code...

....