Remove old code.
More tweaks related to notifications, add notifications to remaining resolvers.