Cleanup + notifier update