refactoring for different roles
removing users support