Remove dead code; fix the YouTube bastard handler.