remove unnessary codes