Cleaning up core