BBC - More JS cleanup