Remove Roster References

Roster was removed in a previous commit, but references to it still
existed. This commit removes them.