Cleaned up Zurukea's mess