More cleanup hopefully, not fun when MCPatcher variables don't line up.