trivial code cleanup of schema upgrades