Code cleanup and `--upgrade` removal.

Why are you commenting this out?