removed extra code that was not needed