Clean up some more
This is where ruby bites