upgrade.php cleanup