Cleanup of upgrade scripts