Revert useless conditions