working websocket functionality, tweak to notification service for cleanup