Clean up roster handling