Remove references to subscriber