Cleaned up World-Core