Feature xaml cleanup