Remove all occurrences of MemberModel and TrivialMemberModel