added mitch's opt-in removal code