changes for jbide-13213 forgot to remove listener during dispose