Some cleanup
Typing notification and cleanup