cleaning & notification changes