Cleanup some more of the /hat command