Merge "Remove internal user-specific state after user removal."