UserManager and UserService cleand up fixec #3