Removed unneeded logic