Cleans up by stripping listeners in controller and putting them in MessageService