Remove unnecessary elsif checks