Cleaned up XAML/C# code

Removed unnecessary bits