diff --git a/packages/core/src/canvas/model/CanvasSpot.ts b/packages/core/src/canvas/model/CanvasSpot.ts
index 2f71e74e2..96c18e57e 100644
--- a/packages/core/src/canvas/model/CanvasSpot.ts
+++ b/packages/core/src/canvas/model/CanvasSpot.ts
@@ -12,7 +12,6 @@ export enum CanvasSpotBuiltInTypes {
   Spacing = 'spacing',
   Target = 'target',
   Resize = 'resize',
-  Drag = 'drag',
 }
 
 export type CanvasSpotBuiltInType = `${CanvasSpotBuiltInTypes}`;
diff --git a/packages/core/src/commands/config/config.ts b/packages/core/src/commands/config/config.ts
index 321588c0a..dd0067eda 100644
--- a/packages/core/src/commands/config/config.ts
+++ b/packages/core/src/commands/config/config.ts
@@ -57,17 +57,7 @@ const config: () => CommandsConfig = () => ({
   stylePrefix: 'com-',
   defaults: {},
   strict: true,
-  defaultOptions: {
-    'core:component-drag': {
-      run: (options: CommandOptions) => ({
-        ...options,
-        // addStyle: ({ componentView, matchedEl }) => {
-        //   // TODO: test if you can conver to percentage
-        //   // componentView.setStyle({ opacity: 0.5 });
-        // },
-      }),
-    },
-  },
+  defaultOptions: {},
 });
 
 export default config;
diff --git a/packages/core/src/commands/view/ComponentDrag.ts b/packages/core/src/commands/view/ComponentDrag.ts
index caeb898a2..4fcef6312 100644
--- a/packages/core/src/commands/view/ComponentDrag.ts
+++ b/packages/core/src/commands/view/ComponentDrag.ts
@@ -4,8 +4,8 @@ import type { CommandObject } from './CommandAbstract';
 import type Editor from '../../editor';
 import type Component from '../../dom_components/model/Component';
 import type EditorModel from '../../editor/model/Editor';
-import { getComponentView } from '../../utils/mixins';
-import ComponentView from '../../dom_components/view/ComponentView';
+import { getComponentModel, getComponentView } from '../../utils/mixins';
+import type ComponentView from '../../dom_components/view/ComponentView';
 
 type Rect = { left: number; width: number; top: number; height: number };
 type OrigRect = { left: number; width: number; top: number; height: number; rect: Rect };
@@ -38,13 +38,12 @@ type Opts = {
 
 // TODO: should we export this type? and if so, we should create 1 type for every event?
 export type DragEventProps = {
-  coords?: { x: number; y: number };
   originComponent?: Component;
   originComponentView?: ComponentView;
   originGuides?: any;
   matchedComponent?: Component;
   matchedComponentView?: ComponentView;
-  matchedGuides?: any;
+  matchedGuides?: any; // TODO: type this
 };
 
 const evName = 'dmode';
@@ -130,7 +129,6 @@ export default {
       const pfx = editor.getConfig().stylePrefix;
       const elInfoX = document.createElement('div');
       const elInfoY = document.createElement('div');
-
       const guideContent = `<div class="${pfx}guide-info__line ${pfx}danger-bg">
         <div class="${pfx}guide-info__content ${pfx}danger-color"></div>
       </div>`;
@@ -220,7 +218,6 @@ export default {
     const un = 'px';
     const guideSize = item.active ? 2 : 1;
     let numEl = el.children[0];
-
     el.style = `position: absolute; background-color: ${item.active ? 'green' : 'red'};`;
 
     if (!el.children.length) {
@@ -394,8 +391,7 @@ export default {
 
     const originComponent = target;
     const originComponentView = getComponentView(originComponent);
-    const guidesTargetActive = guidesTarget;
-    const originGuides = this.renderGuideInfo(guidesTargetActive);
+    const originGuides = this.renderGuideInfo(guidesTarget);
 
     const dragStartProps: DragEventProps = {
       originComponent,
@@ -417,11 +413,11 @@ export default {
     opts?.onDrag && opts.onDrag(this._getDragData());
 
     const { x, y } = mouseEvent;
-    let matchedComponent = matchedGuides[0]?.matched.origin;
-    let matchedComponentView = getComponentView(matchedComponent);
+    const matchedComponentEl = matchedGuides[0]?.matched.origin;
+    let matchedComponent = getComponentModel(matchedComponentEl);
+    let matchedComponentView = getComponentView(matchedComponentEl);
 
     const dragMoveProps: DragEventProps = {
-      coords: { x, y },
       matchedComponent,
       matchedComponentView,
       matchedGuides,