Notice cleanup