Clean up in controllers.php