GPII-669: Removed saving listener and minor change in model listener.