diff --git a/Tutorial/GacUI_Controls/AddressBook/UI/Source/MainWindow.cpp b/Tutorial/GacUI_Controls/AddressBook/UI/Source/MainWindow.cpp
index 0fc1904a..94f4ee0c 100644
--- a/Tutorial/GacUI_Controls/AddressBook/UI/Source/MainWindow.cpp
+++ b/Tutorial/GacUI_Controls/AddressBook/UI/Source/MainWindow.cpp
@@ -63,30 +63,6 @@ namespace demo
 	{
 	}
 
-	void MainWindow::commandBigIcon_Executed(::vl::presentation::compositions::GuiGraphicsComposition* sender, vl::presentation::compositions::GuiEventArgs& arguments)
-	{
-	}
-
-	void MainWindow::commandDetail_Executed(::vl::presentation::compositions::GuiGraphicsComposition* sender, vl::presentation::compositions::GuiEventArgs& arguments)
-	{
-	}
-
-	void MainWindow::commandInformation_Executed(::vl::presentation::compositions::GuiGraphicsComposition* sender, vl::presentation::compositions::GuiEventArgs& arguments)
-	{
-	}
-
-	void MainWindow::commandList_Executed(::vl::presentation::compositions::GuiGraphicsComposition* sender, vl::presentation::compositions::GuiEventArgs& arguments)
-	{
-	}
-
-	void MainWindow::commandSmallIcon_Executed(::vl::presentation::compositions::GuiGraphicsComposition* sender, vl::presentation::compositions::GuiEventArgs& arguments)
-	{
-	}
-
-	void MainWindow::commandTile_Executed(::vl::presentation::compositions::GuiGraphicsComposition* sender, vl::presentation::compositions::GuiEventArgs& arguments)
-	{
-	}
-
 	// #endregion CLASS_MEMBER_GUIEVENT_HANDLER
 
 	void MainWindow::ClearViewSelection()
diff --git a/Tutorial/GacUI_Controls/TextEditor/UI/Source/MainWindow.cpp b/Tutorial/GacUI_Controls/TextEditor/UI/Source/MainWindow.cpp
index e135ac0b..1495f5f4 100644
--- a/Tutorial/GacUI_Controls/TextEditor/UI/Source/MainWindow.cpp
+++ b/Tutorial/GacUI_Controls/TextEditor/UI/Source/MainWindow.cpp
@@ -186,6 +186,7 @@ namespace demo
 
 	void MainWindow::window_Closing(::vl::presentation::compositions::GuiGraphicsComposition* sender, ::vl::presentation::compositions::GuiRequestEventArgs& arguments)
 	{
+		arguments.cancel = !CanCloseFile();
 	}
 
 	void MainWindow::OnCreate()
@@ -199,11 +200,6 @@ namespace demo
 	{
 	}
 
-	void MainWindow::window_Closing(::vl::presentation::compositions::GuiGraphicsComposition* sender, vl::presentation::compositions::GuiRequestEventArgs& arguments)
-	{
-		arguments.cancel = !CanCloseFile();
-	}
-
 	// #endregion CLASS_MEMBER_GUIEVENT_HANDLER
 
 	bool MainWindow::CanCloseFile()