remove unnessary code