Removing security and tenant mgt components