Clean up the ugliest of the messes.