Get rid of some un-needed by refs