removed unnessassary code