removed vestigial user-id