EPG removal bug fixed