Fixes #16 can't remove conditions (rework #12 also)