Finished cleanup of roster generation class