some code cleanup to deal with the roster mgmt changes from earlier