Tidy up logouts
Remove non-auth stuff out of auth