[TASK] Fix unreachable code areas