diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c
index 841759ef153..69fb50bcf2b 100644
--- a/source/blender/blenkernel/intern/armature.c
+++ b/source/blender/blenkernel/intern/armature.c
@@ -132,6 +132,14 @@ void free_armature(bArmature *arm)
 	if (arm) {
 		/*		unlink_armature(arm);*/
 		free_bones(arm);
+		
+		/* free editmode data */
+		if (arm->edbo) {
+			BLI_freelistN(arm->edbo);
+			
+			MEM_freeN(arm->edbo);
+			arm->edbo= NULL;
+		}
 	}
 }
 
diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c
index 9ae7b8c8198..b82c0d2a6c8 100644
--- a/source/blender/editors/armature/editarmature.c
+++ b/source/blender/editors/armature/editarmature.c
@@ -3228,7 +3228,6 @@ void extrude_armature(Scene *scene, int forked)
  * appropriate ways), and two separate ones.
  */
 
-/* context; editmode armature */
 static int armature_subdivide_exec(bContext *C, wmOperator *op)
 {
 	Object *obedit= CTX_data_edit_object(C);