Cleanup XAML