Updates to reflect deletion of many EPG lists from Wikipedia
Lose some debugging for Freeview-specific changes