Redid cleanup done by fkmclane, I accidentally...

Reversed the changes when adding the mario stuff