remove unnucessary code