Cleaning up after the upgrade...