removed some extra code