Cleaning/refactoring.
Removing stale delegate.
Refactoring.