Clean up Application.php