Remove bdwyer's hackhacks