Cleaned up the core.