Sauce cleanup

Why, this is a easy failsav way to do this, which we are using since years.

I agree, a more complex local and global planner should take this into account. But for me this is a absolute valid way to solve this issue on a reactive layer.