Hooks incomplete for requeuing stale messages when new session is started
Some cleanup