removed unnessesary code