Reindent and remove deprecated stuff.