Removed Unneeded code