Fix: Booleans are not removed