Cleanup user/group defaults

No functional change.