Removed unneeded conditional