Remove useless model listener methods
Finish merging server and model listener interfaces