Further cleanup of SQLDatabaseManager upgrades