Optimize roster handling
Cleanup