diff --git a/src/components/Nodes/wrapNode.tsx b/src/components/Nodes/wrapNode.tsx
index 6b572522..b3f9bb21 100644
--- a/src/components/Nodes/wrapNode.tsx
+++ b/src/components/Nodes/wrapNode.tsx
@@ -232,7 +232,6 @@ export default (NodeComponent: ComponentType<NodeProps>) => {
     ]);
 
     return (
-      // @ts-ignore
       <DraggableCore
         onStart={onDragStart}
         onDrag={onDrag}
diff --git a/src/components/NodesSelection/index.tsx b/src/components/NodesSelection/index.tsx
index 8c0809dd..72f25f96 100644
--- a/src/components/NodesSelection/index.tsx
+++ b/src/components/NodesSelection/index.tsx
@@ -24,9 +24,7 @@ const selector = (s: ReactFlowState) => ({
   transform: s.transform,
   selectedNodesBbox: s.selectedNodesBbox,
   userSelectionActive: s.userSelectionActive,
-  selectedNodes: Array.from(s.nodeInternals)
-    .filter(([_, n]) => n.selected)
-    .map(([_, n]) => n),
+  selectedNodes: Array.from(s.nodeInternals.values()).filter((n) => n.selected),
   snapToGrid: s.snapToGrid,
   snapGrid: s.snapGrid,
   updateNodePosition: s.updateNodePosition,
@@ -113,7 +111,6 @@ function NodesSelection({
 
   return (
     <div className={cc(['react-flow__nodesselection', 'react-flow__container', noPanClassName])} style={style}>
-      {/* @ts-ignore */}
       <DraggableCore
         scale={tScale}
         grid={grid}