remove old model listener stuff