Removed unnessary code!