Remove tautological if blocks