MainController cleaning