changes for jbide-13213 forcing a model listener instead
changes for jbide-13213 forgot to remove listener during dispose