Tidying up HCT crap.