Make sure to remove related descriptors on tenant deletion