removed notify code