removed unnessessary code