Cleanup + fixed exception on anon users