Merge "Removes additional subtypes when clearing data."