Modified removal code, so subscribers are removed when become incative