Removed the unneeded code