back to single user

-removed the service user entry
-minor cleanup