Removed unneeded if checks