Remove some indented if blocks