Remove remaining traces