[EPGList] cleanup alot of code,  thx andyb!