Clean up of notification handler