Get rid of some quick hacks