Cleanup of default.php