Cleaning up after reenginering