removed unnessary code