Removed unneeded conditional tests