removed extra code