Removing some unreliable code which guarded against repeat sets.
Guarding against stop observing to minimise the number of exceptions being thrown.