remove unnesseccary code