Removed extra code not needed