Merge "There should be a way to clear additional subtypes."