Remove SelfMemberReference check