Removed unnessecary code