Super-duper XAML cleanup