diff --git a/Configuration/NodeTypes.Media.yaml b/Configuration/NodeTypes.Media.yaml
index 966f799..c351151 100644
--- a/Configuration/NodeTypes.Media.yaml
+++ b/Configuration/NodeTypes.Media.yaml
@@ -1,145 +1,3 @@
-# -----------------------------------------------------------------------------
-#
-# Orbit: parent NodeType of OrbitItem.
-#
-# -----------------------------------------------------------------------------
-'M12.Foundation:Orbit':
-  superTypes:
-    - 'TYPO3.Neos:Content'
-  ui:
-    label: 'Orbit'
-    icon: 'icon-picture'
-    group: 'foundationMedia'
-    inlineEditable: TRUE
-    inspector:
-      groups:
-        orbitSettings:
-          label: 'Orbit settings'
-          position: 9
-  childNodes:
-    content:
-      type: 'TYPO3.Neos:ContentCollection'
-  properties:
-    animation:
-      type: string
-      defaultValue: ''
-      ui:
-        label: 'Animation effect'
-        reloadIfChanged: TRUE
-        inspector:
-          group: 'orbitSettings'
-          position: 10
-          editor: 'TYPO3.Neos/Inspector/Editors/SelectBoxEditor'
-          editorOptions:
-            values:
-              '':
-                label: 'Slide'
-              fade:
-                label: 'Fade'
-    animationSpeed:
-      type: string
-      defaultValue: ''
-      ui:
-        label: 'Animation speed (ms)'
-        reloadIfChanged: FALSE
-        inspector:
-          group: 'orbitSettings'
-          position: 12
-          editorOptions:
-            placeholder: '500'
-      validation:
-        regularExpression:
-          regularExpression: '/^[0-9]{1,5}$/'
-    timerSpeed:
-      type: string
-      defaultValue: ''
-      ui:
-        label: 'Timer speed (ms)'
-        reloadIfChanged: FALSE
-        inspector:
-          group: 'orbitSettings'
-          position: 14
-          editorOptions:
-            placeholder: '10000'
-      validation:
-        regularExpression:
-          regularExpression: '/^[0-9]{2,6}$/'
-    nextOnClick:
-      type: boolean
-      defaultValue: TRUE
-      ui:
-        label: 'Advance to next on click'
-        reloadIfChanged: TRUE
-        inspector:
-          group: 'orbitSettings'
-    navigationArrows:
-      type: boolean
-      defaultValue: TRUE
-      ui:
-        label: 'Show navigation arrows'
-        reloadIfChanged: TRUE
-        inspector:
-          group: 'orbitSettings'
-    slideNumber:
-      type: boolean
-      defaultValue: TRUE
-      ui:
-        label: 'Show slide number'
-        reloadIfChanged: TRUE
-        inspector:
-          group: 'orbitSettings'
-    bullets:
-      type: boolean
-      defaultValue: TRUE
-      ui:
-        label: 'Show bullets (pager)'
-        reloadIfChanged: TRUE
-        inspector:
-          group: 'orbitSettings'
-    timer:
-      type: boolean
-      defaultValue: TRUE
-      ui:
-        label: 'Activate timer'
-        reloadIfChanged: TRUE
-        inspector:
-          group: 'orbitSettings'
-    variableHeight:
-      type: boolean
-      defaultValue: TRUE
-      ui:
-        label: 'Allow viarable height content'
-        reloadIfChanged: TRUE
-        inspector:
-          group: 'orbitSettings'
-    swipe:
-      type: boolean
-      defaultValue: TRUE
-      ui:
-        label: 'Swipe active'
-        reloadIfChanged: TRUE
-        inspector:
-          group: 'orbitSettings'
-    pauseOnHover:
-      type: boolean
-      defaultValue: TRUE
-      ui:
-        label: 'Pauses on hover'
-        reloadIfChanged: TRUE
-        inspector:
-          group: 'orbitSettings'
-          position: 70
-    resumeOnMouseout:
-      type: boolean
-      defaultValue: FALSE
-      ui:
-        label: 'Resume on mouse out'
-        reloadIfChanged: TRUE
-        inspector:
-          group: 'orbitSettings'
-          position: 72
-
-
 #
 # Flex Video
 #
diff --git a/Resources/Private/Templates/NodeTypes/Orbit.html b/Resources/Private/Templates/NodeTypes/Orbit.html
deleted file mode 100644
index 7cd6e6b..0000000
--- a/Resources/Private/Templates/NodeTypes/Orbit.html
+++ /dev/null
@@ -1,53 +0,0 @@
-{namespace ts=TYPO3\TypoScript\ViewHelpers}
-{namespace neos=TYPO3\Neos\ViewHelpers}
-{namespace media=TYPO3\Media\ViewHelpers}
-
-<!-- Slider root container -->
-<f:section name="sliderRoot">
-	<div class="extra-wrapper-required-by-neos-backend">
-		<f:render partial="Anchor" arguments="{_all}" />
-		<ts:render path="orbitContent" />
-	</div>
-</f:section>
-
-<!-- Slider item -->
-<f:section name="sliderItem">
-	<f:if condition="{iterator.isFirst}">
-		<ul{parentAttributes -> f:format.raw()}>
-	</f:if>
-
-	<li><ts:render path="orbitItemContent" /></li>
-
-	<f:if condition="{iterator.isLast}">
-		</ul>
-	</f:if>
-</f:section>
-
-
-<!-- Image, when rendered inside slider -->
-<f:section name="sliderItemImage">
-	<f:if condition="{image}">
-		<f:then>
-			<f:if condition="{link}">
-				<f:then>
-					<a href="{link}"><media:image asset="{image}" alt="{alternativeText}" title="{title}" maximumWidth="{maximumWidth}" maximumHeight="{maximumHeight}" allowCropping="{allowCropping}" allowUpScaling="{allowUpScaling}" /></a>
-				</f:then>
-				<f:else>
-					<media:image asset="{image}" alt="{alternativeText}" title="{title}" maximumWidth="{maximumWidth}" maximumHeight="{maximumHeight}" allowCropping="{allowCropping}" allowUpScaling="{allowUpScaling}" />
-				</f:else>
-			</f:if>
-		</f:then>
-		<f:else>
-			<f:security.ifAccess resource="TYPO3_Neos_Backend_GeneralAccess">
-				<f:if condition="{node.context.workspace.name} != 'live'">
-					<img src="{f:uri.resource(package: 'TYPO3.Neos', path: 'Images/dummy-image.png')}" title="Dummy image" alt="Dummy image" class="neos-handle" />
-				</f:if>
-			</f:security.ifAccess>
-		</f:else>
-	</f:if>
-	<f:if condition="{hasCaption}">
-		<div class="orbit-caption">
-			{neos:contentElement.editable(property: 'caption', node: node)}
-		</div>
-	</f:if>
-</f:section>
diff --git a/Resources/Private/TypoScript/Prototypes/Orbit.ts2 b/Resources/Private/TypoScript/Prototypes/Orbit.ts2
deleted file mode 100644
index 402c535..0000000
--- a/Resources/Private/TypoScript/Prototypes/Orbit.ts2
+++ /dev/null
@@ -1,58 +0,0 @@
-prototype(M12.Foundation:Orbit) < prototype(M12.Foundation:Content) {
-	templatePath = 'resource://M12.Foundation/Private/Templates/NodeTypes/Orbit.html'
-	sectionName = 'sliderRoot'
-
-	node = ${node}
-
-	attributes.data-orbit = ''
-	attributes.data-options = TYPO3.TypoScript:RawArray {
-		animation = ${q(node).property('animation')                 ? 'animation:' + q(node).property('setAnimation') + ';' : null}
-		animationSpeed = ${q(node).property('animationSpeed')       ? 'animation_speed:' + String.toInteger(q(node).property('animationSpeed')) + ';' : null}
-		timerSpeed = ${q(node).property('timerSpeed')               ? 'timer_speed:' + String.toInteger(q(node).property('timerSpeed')) + ';' : null}
-		bullets = ${q(node).property('bullets')                     ? 'bullets:true;' : 'bullets:false;'}
-		navigationArrows = ${q(node).property('navigationArrows')   ? 'navigation_arrows:true;' : 'navigation_arrows:false;'}
-		nextOnClick = ${q(node).property('nextOnClick')             ? 'next_on_click:true;' : 'next_on_click:false;'}
-		slideNumber = ${q(node).property('slideNumber')             ? 'slide_number:true;' : 'slide_number:false;'}
-		timer = ${q(node).property('timer')                         ? 'timer:true;' : 'timer:false;'}
-		variableHeight = ${q(node).property('variableHeight')       ? 'variable_height:true;' : 'variable_height:false;'}
-		swipe = ${q(node).property('swipe')                         ? 'swipe:true;' : 'swipe:false;'}
-		pauseOnHover = ${q(node).property('pauseOnHover')           ? 'pause_on_hover:true;' : 'pause_on_hover:false;'}
-		resumeOnMouseout = ${q(node).property('resumeOnMouseout')   ? 'resume_on_mouseout:true;' : 'resume_on_mouseout:false;'}
-	}
-
-	@override.parentAttributes = ${this.attributes}
-
-	orbitContent = TYPO3.Neos:ContentCollection {
-		nodePath = 'content'
-
-		iterationName = 'iterator'
-		itemName = 'orbitNodeItem'
-		itemRenderer = M12.Foundation:OrbitItem
-	}
-
-	@process.wrapRemover = M12.Utils:WrapRemover
-	@process.wrapRemover.wrapperClass = 'extra-wrapper-required-by-neos-backend'
-}
-
-
-prototype(M12.Foundation:OrbitItem) < prototype(M12.Foundation:Content) {
-	templatePath = 'resource://M12.Foundation/Private/Templates/NodeTypes/Orbit.html'
-	sectionName = 'sliderItem'
-
-	iterator = ${iterator}
-	parentAttributes = ${parentAttributes}
-
-	orbitItemContent = TYPO3.TypoScript:Collection {
-		collection = ${q(orbitNodeItem)}
-		itemName = 'node'
-		itemRenderer = TYPO3.Neos:ContentCase
-	}
-
-	#
-	# Re-define how Image is rendered inside slider
-	#
-	prototype(TYPO3.Neos.NodeTypes:Image) {
-		templatePath = 'resource://M12.Foundation/Private/Templates/NodeTypes/Orbit.html'
-		sectionName = 'sliderItemImage'
-    }
-}