Simplify upgrade.
Freshen SQL