Removed some extra code