Revert "refactoring out creation of users"

This reverts commit bd9c558fe08df8a2631381b5786211159a3e0874.
removing comment