Cleanups to inviting, removing, and more