Renamed AddWillBeRemovedObserver to CreateWillBeRemovedObserver
Using Dictionary.TryGetValue instead of .ContainsKey