cleanup
fixed notification update support