Cleaning up the core