fix double removals