Controllers cleanup