Merge "Trust: Add missing cleanup upon removing user"