Fixed non-member removal