remove the rest of the temp hack