Removed unnessary code