Cleaned up member management.