Cleaning up the Core