Undo change as @hlbraddock reports it is not necessary
clean up logout method (NPE)
Merge branch 'feat/relayLogout' into dev