removed extra codes