removed use of old MainController