Simplifications (no user management) and refactoring