Controllers cleanup.