Remove remnants of TEMP hack.