xaml cleanup