Misc Cleanup in Membership.