Clean up some of the horrors