Make some clean into the helpers files