database.php cleanup