Resolve "Improve logout and ensure we don't leak logged in state after logout"

Closes #124 (closed) and #155 (closed)