more notify messages cleanup