`team clear` refactor