removed unnessecary code