Removed various Roster instances that were missted.

Roster is no longer used, so various instances where it was referenced
was removed.