Remove unused method
Simplify insertRosterItem and fix bug for remove case
Remove unnecessary field
fix typos
Delete debug comment
Trivial: Undo whitespace changes