Remove leaky no_separation code