diff --git a/src/source/DataModelV2/DataModelInstance.cpp b/src/source/DataModelV2/DataModelInstance.cpp
index 0b0d7c6..8fe3380 100644
--- a/src/source/DataModelV2/DataModelInstance.cpp
+++ b/src/source/DataModelV2/DataModelInstance.cpp
@@ -471,7 +471,6 @@ bool DataModelInstance::scanXMLObject(xml_node<> * scanNode)
 				{
 					return false;
 				}
-
 			}
 		}
 		/*
diff --git a/src/source/Listener/GUDButtonListener.cpp b/src/source/Listener/GUDButtonListener.cpp
index c689967..b6032ff 100644
--- a/src/source/Listener/GUDButtonListener.cpp
+++ b/src/source/Listener/GUDButtonListener.cpp
@@ -72,15 +72,13 @@ void GUDButtonListener::onButton1MouseClick(BaseButtonInstance* button)
 			for(size_t i = 0; i < SelectionSvc->getSelection().size(); i++)
 			{
 				Instance* selection = SelectionSvc->getSelection()[i];
-				if(selection->canDelete && selection->getClassName() == "GroupInstance")
+
+				if(GroupInstance* model = dynamic_cast<GroupInstance*>(selection))
 				{
-					if(GroupInstance* model = dynamic_cast<GroupInstance*>(SelectionSvc->getSelection()[i]))
-					{
-						newinst = model->unGroup();
-						model->setParent(NULL);
-						delete model;
-						model = NULL;
-					}
+					newinst = model->unGroup();
+					model->setParent(NULL);
+					delete model;
+					model = NULL;
 				}
 			}
 			SelectionSvc->clearSelection();