Remove hardcoded users
Refactorings