cleaning up some extra code