remove unnessesary code