Сontrollers cleanup