Remove then/else from conditional