Whitespace fixes.
Removed vestigal upgrade code.