diff --git a/src/Mod/Draft/DraftEdit.py b/src/Mod/Draft/DraftEdit.py
index 397c0819e4..f9544ccaac 100644
--- a/src/Mod/Draft/DraftEdit.py
+++ b/src/Mod/Draft/DraftEdit.py
@@ -439,12 +439,6 @@ class Edit():
             event.getButton() == event.BUTTON1
             ):#left click
             if not event.wasAltDown():
-                if self.ui.addButton.isChecked():
-                    self.addPoint(event)
-                    return
-                if self.ui.delButton.isChecked():
-                    self.delPoint(event)
-                    return
                 if Draft.getType(self.obj) == "BezCurve" and (self.ui.sharpButton.isChecked()
                                         or self.ui.tangentButton.isChecked() or
                                         self.ui.symmetricButton.isChecked()):
@@ -457,12 +451,6 @@ class Edit():
                     self.obj = doc.getObject(str(node.objectName.getValue()))
                     if self.obj is None:
                         return
-                    if self.ui.sharpButton.isChecked():
-                        return self.smoothBezPoint(self.obj, ep, 'Sharp')
-                    elif self.ui.tangentButton.isChecked():
-                        return self.smoothBezPoint(self.obj, ep, 'Tangent')
-                    elif self.ui.symmetricButton.isChecked():
-                        return self.smoothBezPoint(self.obj, ep, 'Symmetric')
                 if self.editing is None:
                     self.startEditing(event)
                 else:
diff --git a/src/Mod/Draft/DraftGui.py b/src/Mod/Draft/DraftGui.py
index 9cd2141777..19de0f5a4c 100644
--- a/src/Mod/Draft/DraftGui.py
+++ b/src/Mod/Draft/DraftGui.py
@@ -403,14 +403,14 @@ class DraftToolBar:
         boldtxt.setBold(True)
         self.cmdlabel.setFont(boldtxt)
 
-        # subcommands
+        # subcommands for draft Edit, OBSOLETE
 
-        self.addButton = self._pushbutton("addButton", self.layout, icon="Draft_AddPoint", width=22, checkable=True)
-        self.delButton = self._pushbutton("delButton", self.layout, icon="Draft_DelPoint", width=22, checkable=True)
-        self.sharpButton = self._pushbutton("sharpButton", self.layout, icon="Draft_BezSharpNode", width=22, checkable=True)
-        self.tangentButton = self._pushbutton("tangentButton", self.layout, icon="Draft_BezTanNode", width=22, checkable=True)
-        self.symmetricButton = self._pushbutton("symmetricButton", self.layout, icon="Draft_BezSymNode", width=22, checkable=True)
-        self.arc3PtButton = self._pushbutton("arc3PtButton", self.layout, icon="Draft_Arc", width=22, checkable=True)
+        # self.addButton = self._pushbutton("addButton", self.layout, icon="Draft_AddPoint", width=22, checkable=True)
+        # self.delButton = self._pushbutton("delButton", self.layout, icon="Draft_DelPoint", width=22, checkable=True)
+        # self.sharpButton = self._pushbutton("sharpButton", self.layout, icon="Draft_BezSharpNode", width=22, checkable=True)
+        # self.tangentButton = self._pushbutton("tangentButton", self.layout, icon="Draft_BezTanNode", width=22, checkable=True)
+        # self.symmetricButton = self._pushbutton("symmetricButton", self.layout, icon="Draft_BezSymNode", width=22, checkable=True)
+        # self.arc3PtButton = self._pushbutton("arc3PtButton", self.layout, icon="Draft_Arc", width=22, checkable=True)
 
         # point
 
@@ -549,12 +549,13 @@ class DraftToolBar:
         QtCore.QObject.connect(self.textValue,QtCore.SIGNAL("textChanged()"),self.checkEnterText)
         QtCore.QObject.connect(self.textOkButton,QtCore.SIGNAL("clicked()"),self.sendText)
         QtCore.QObject.connect(self.zValue,QtCore.SIGNAL("returnPressed()"),self.setFocus)
-        QtCore.QObject.connect(self.addButton,QtCore.SIGNAL("toggled(bool)"),self.setAddMode)
-        QtCore.QObject.connect(self.delButton,QtCore.SIGNAL("toggled(bool)"),self.setDelMode)
-        QtCore.QObject.connect(self.sharpButton,QtCore.SIGNAL("toggled(bool)"),self.setSharpMode)
-        QtCore.QObject.connect(self.tangentButton,QtCore.SIGNAL("toggled(bool)"),self.setTangentMode)
-        QtCore.QObject.connect(self.symmetricButton,QtCore.SIGNAL("toggled(bool)"),self.setSymmetricMode)
-        QtCore.QObject.connect(self.arc3PtButton,QtCore.SIGNAL("toggled(bool)"),self.setArc3PtMode)
+        # Draft Edit UI obsolete due to introduction of incommand context menu
+        # QtCore.QObject.connect(self.addButton,QtCore.SIGNAL("toggled(bool)"),self.setAddMode)
+        # QtCore.QObject.connect(self.delButton,QtCore.SIGNAL("toggled(bool)"),self.setDelMode)
+        # QtCore.QObject.connect(self.sharpButton,QtCore.SIGNAL("toggled(bool)"),self.setSharpMode)
+        # QtCore.QObject.connect(self.tangentButton,QtCore.SIGNAL("toggled(bool)"),self.setTangentMode)
+        # QtCore.QObject.connect(self.symmetricButton,QtCore.SIGNAL("toggled(bool)"),self.setSymmetricMode)
+        # QtCore.QObject.connect(self.arc3PtButton,QtCore.SIGNAL("toggled(bool)"),self.setArc3PtMode)
         QtCore.QObject.connect(self.finishButton,QtCore.SIGNAL("pressed()"),self.finish)
         QtCore.QObject.connect(self.closeButton,QtCore.SIGNAL("pressed()"),self.closeLine)
         QtCore.QObject.connect(self.wipeButton,QtCore.SIGNAL("pressed()"),self.wipeLine)
@@ -681,12 +682,12 @@ class DraftToolBar:
         self.continueCmd.setText(translate("draft", "Continue")+" ("+inCommandShortcuts["Continue"][0]+")")
         self.occOffset.setToolTip(translate("draft", "If checked, an OCC-style offset will be performed instead of the classic offset"))
         self.occOffset.setText(translate("draft", "&OCC-style offset"))
-        self.addButton.setToolTip(translate("draft", "Add points to the current object"))
-        self.delButton.setToolTip(translate("draft", "Remove points from the current object"))
-        self.sharpButton.setToolTip(translate("draft", "Make Bezier node sharp"))
-        self.tangentButton.setToolTip(translate("draft", "Make Bezier node tangent"))
-        self.symmetricButton.setToolTip(translate("draft", "Make Bezier node symmetric"))
-        self.arc3PtButton.setToolTip(translate("draft", "Toggle radius and angles arc editing"))
+        # self.addButton.setToolTip(translate("draft", "Add points to the current object"))
+        # self.delButton.setToolTip(translate("draft", "Remove points from the current object"))
+        # self.sharpButton.setToolTip(translate("draft", "Make Bezier node sharp"))
+        # self.tangentButton.setToolTip(translate("draft", "Make Bezier node tangent"))
+        # self.symmetricButton.setToolTip(translate("draft", "Make Bezier node symmetric"))
+        # self.arc3PtButton.setToolTip(translate("draft", "Toggle radius and angles arc editing"))
         self.undoButton.setText(translate("draft", "&Undo (CTRL+Z)"))
         self.undoButton.setToolTip(translate("draft", "Undo the last segment"))
         self.closeButton.setText(translate("draft", "Close")+" ("+inCommandShortcuts["Close"][0]+")")
@@ -972,12 +973,12 @@ class DraftToolBar:
             self.isRelative.hide()
             self.hasFill.hide()
             self.finishButton.hide()
-            self.addButton.hide()
-            self.delButton.hide()
-            self.sharpButton.hide()
-            self.tangentButton.hide()
-            self.symmetricButton.hide()
-            self.arc3PtButton.hide()
+            # self.addButton.hide()
+            # self.delButton.hide()
+            # self.sharpButton.hide()
+            # self.tangentButton.hide()
+            # self.symmetricButton.hide()
+            # self.arc3PtButton.hide()
             self.undoButton.hide()
             self.closeButton.hide()
             self.wipeButton.hide()
@@ -1110,28 +1111,28 @@ class DraftToolBar:
         self.numFaces.hide()
         self.isRelative.hide()
         self.hasFill.hide()
-        self.addButton.show()
-        self.delButton.show()
-        if mode == 'Wire':
-            self.setEditButtons(True)
-            self.setBezEditButtons(False)
-        elif mode == 'Arc':
-            self.addButton.hide()
-            self.delButton.hide()
-            self.arc3PtButton.show()
-        elif mode == 'BezCurve':
-            self.sharpButton.show()
-            self.tangentButton.show()
-            self.symmetricButton.show()
+        # self.addButton.show()
+        # self.delButton.show()
+        # if mode == 'Wire':
+        #     self.setEditButtons(True)
+        #     self.setBezEditButtons(False)
+        # elif mode == 'Arc':
+        #     self.addButton.hide()
+        #     self.delButton.hide()
+        #     self.arc3PtButton.show()
+        # elif mode == 'BezCurve':
+        #     self.sharpButton.show()
+        #     self.tangentButton.show()
+        #     self.symmetricButton.show()
         self.closeButton.show()
-        self.finishButton.show()
+        # self.finishButton.show()
         # always start Edit with buttons unchecked
-        self.addButton.setChecked(False)
-        self.delButton.setChecked(False)
-        self.sharpButton.setChecked(False)
-        self.tangentButton.setChecked(False)
-        self.symmetricButton.setChecked(False)
-        self.arc3PtButton.setChecked(False)
+        # self.addButton.setChecked(False)
+        # self.delButton.setChecked(False)
+        # self.sharpButton.setChecked(False)
+        # self.tangentButton.setChecked(False)
+        # self.symmetricButton.setChecked(False)
+        # self.arc3PtButton.setChecked(False)
 
     def extUi(self):
         if Draft.getParam("UsePartPrimitives",False):
@@ -1149,9 +1150,9 @@ class DraftToolBar:
             self.isCopy.setChecked(p.GetBool("copymodeValue",False))
         self.continueCmd.show()
 
-    def vertUi(self,addmode=True):
-        self.addButton.setChecked(addmode)
-        self.delButton.setChecked(not(addmode))
+    # def vertUi(self,addmode=True):
+    #     self.addButton.setChecked(addmode)
+    #     self.delButton.setChecked(not(addmode))
 
     def checkLocal(self):
         """checks if x,y,z coords must be displayed as local or global"""
@@ -1164,14 +1165,14 @@ class DraftToolBar:
                 self.labely.setText(translate("draft", "Local Y"))
                 self.labelz.setText(translate("draft", "Local Z"))
 
-    def setEditButtons(self,mode):
-        self.addButton.setEnabled(mode)
-        self.delButton.setEnabled(mode)
+    # def setEditButtons(self,mode):
+    #     self.addButton.setEnabled(mode)
+    #     self.delButton.setEnabled(mode)
 
-    def setBezEditButtons(self,mode):
-        self.sharpButton.setEnabled(mode)
-        self.tangentButton.setEnabled(mode)
-        self.symmetricButton.setEnabled(mode)
+    # def setBezEditButtons(self,mode):
+    #     self.sharpButton.setEnabled(mode)
+    #     self.tangentButton.setEnabled(mode)
+    #     self.symmetricButton.setEnabled(mode)
 
     def setNextFocus(self):
         def isThere(widget):
@@ -1790,44 +1791,44 @@ class DraftToolBar:
     def popupTriggered(self,action):
         self.sourceCmd.proceed(str(action.text()))
 
-    def setAddMode(self,bool):
-        if self.addButton.isChecked():
-            self.delButton.setChecked(False)
-            self.symmetricButton.setChecked(False)
-            self.sharpButton.setChecked(False)
-            self.tangentButton.setChecked(False)
+    # def setAddMode(self,bool):
+    #     if self.addButton.isChecked():
+    #         self.delButton.setChecked(False)
+    #         self.symmetricButton.setChecked(False)
+    #         self.sharpButton.setChecked(False)
+    #         self.tangentButton.setChecked(False)
 
-    def setDelMode(self,bool):
-        if self.delButton.isChecked():
-            self.addButton.setChecked(False)
-            self.symmetricButton.setChecked(False)
-            self.sharpButton.setChecked(False)
-            self.tangentButton.setChecked(False)
+    # def setDelMode(self,bool):
+    #     if self.delButton.isChecked():
+    #         self.addButton.setChecked(False)
+    #         self.symmetricButton.setChecked(False)
+    #         self.sharpButton.setChecked(False)
+    #         self.tangentButton.setChecked(False)
 
-    def setSharpMode(self,bool):
-        if self.sharpButton.isChecked():
-            self.tangentButton.setChecked(False)
-            self.symmetricButton.setChecked(False)
-            self.addButton.setChecked(False)
-            self.delButton.setChecked(False)
+    # def setSharpMode(self,bool):
+    #     if self.sharpButton.isChecked():
+    #         self.tangentButton.setChecked(False)
+    #         self.symmetricButton.setChecked(False)
+    #         self.addButton.setChecked(False)
+    #         self.delButton.setChecked(False)
 
-    def setTangentMode(self,bool):
-        if self.tangentButton.isChecked():
-            self.sharpButton.setChecked(False)
-            self.symmetricButton.setChecked(False)
-            self.addButton.setChecked(False)
-            self.delButton.setChecked(False)
+    # def setTangentMode(self,bool):
+    #     if self.tangentButton.isChecked():
+    #         self.sharpButton.setChecked(False)
+    #         self.symmetricButton.setChecked(False)
+    #         self.addButton.setChecked(False)
+    #         self.delButton.setChecked(False)
 
-    def setSymmetricMode(self,bool):
-        if self.symmetricButton.isChecked():
-            self.sharpButton.setChecked(False)
-            self.tangentButton.setChecked(False)
-            self.addButton.setChecked(False)
-            self.delButton.setChecked(False)
+    # def setSymmetricMode(self,bool):
+    #     if self.symmetricButton.isChecked():
+    #         self.sharpButton.setChecked(False)
+    #         self.tangentButton.setChecked(False)
+    #         self.addButton.setChecked(False)
+    #         self.delButton.setChecked(False)
 
-    def setArc3PtMode(self,bool):
-        if self.arc3PtButton.isChecked():
-            self.arc3PtButton.setChecked(True)
+    # def setArc3PtMode(self,bool):
+    #     if self.arc3PtButton.isChecked():
+    #         self.arc3PtButton.setChecked(True)
 
     def setRadiusValue(self,val,unit=None):
         #print("DEBUG: setRadiusValue val: ", val, " unit: ", unit)
diff --git a/src/Mod/Draft/DraftTools.py b/src/Mod/Draft/DraftTools.py
index 9237102300..5f02973cce 100644
--- a/src/Mod/Draft/DraftTools.py
+++ b/src/Mod/Draft/DraftTools.py
@@ -4401,56 +4401,6 @@ class AddToGroup():
                         pass
 
 
-class AddPoint(Modifier):
-    """The Draft_AddPoint FreeCAD command definition"""
-
-    def __init__(self):
-        self.running = False
-
-    def GetResources(self):
-        return {'Pixmap'  : 'Draft_AddPoint',
-                'MenuText': QtCore.QT_TRANSLATE_NOOP("Draft_AddPoint", "Add Point"),
-                'ToolTip': QtCore.QT_TRANSLATE_NOOP("Draft_AddPoint", "Adds a point to an existing Wire or B-spline")}
-
-    def IsActive(self):
-        if FreeCADGui.Selection.getSelection():
-            return True
-        else:
-            return False
-
-    def Activated(self):
-        selection = FreeCADGui.Selection.getSelection()
-        if selection:
-            if (Draft.getType(selection[0]) in ['Wire','BSpline']):
-                FreeCADGui.runCommand("Draft_Edit")
-                FreeCADGui.draftToolBar.vertUi(True)
-
-
-class DelPoint(Modifier):
-    """The Draft_DelPoint FreeCAD command definition"""
-
-    def __init__(self):
-        self.running = False
-
-    def GetResources(self):
-        return {'Pixmap'  : 'Draft_DelPoint',
-                'MenuText': QtCore.QT_TRANSLATE_NOOP("Draft_DelPoint", "Remove Point"),
-                'ToolTip': QtCore.QT_TRANSLATE_NOOP("Draft_DelPoint", "Removes a point from an existing Wire or B-spline")}
-
-    def IsActive(self):
-        if FreeCADGui.Selection.getSelection():
-            return True
-        else:
-            return False
-
-    def Activated(self):
-        selection = FreeCADGui.Selection.getSelection()
-        if selection:
-            if (Draft.getType(selection[0]) in ['Wire','BSpline']):
-                FreeCADGui.runCommand("Draft_Edit")
-                FreeCADGui.draftToolBar.vertUi(False)
-
-
 class WireToBSpline(Modifier):
     """The Draft_Wire2BSpline FreeCAD command definition"""
 
@@ -5681,8 +5631,6 @@ FreeCADGui.addCommand('Draft_Trimex',Trimex())
 FreeCADGui.addCommand('Draft_Scale',Scale())
 FreeCADGui.addCommand('Draft_Drawing',Drawing())
 FreeCADGui.addCommand('Draft_SubelementHighlight', SubelementHighlight())
-FreeCADGui.addCommand('Draft_AddPoint',AddPoint())
-FreeCADGui.addCommand('Draft_DelPoint',DelPoint())
 FreeCADGui.addCommand('Draft_WireToBSpline',WireToBSpline())
 FreeCADGui.addCommand('Draft_Draft2Sketch',Draft2Sketch())
 FreeCADGui.addCommand('Draft_Array',Array())