finishing user refactoring, EDUID-155