Cleaning up Core.