chore: remove some _else_condition
tech debt
#6522
+57
−110
Merged