Cleanup + now can't go back from home to login w/o logging out