minor: further cleanup - try to leave no record behind