Cleanup ControllerManager, add ModelDelegate notify