Cleanup definitions and throw away everything not changed