Code cleanup: The Epic Edition