diff --git a/com.avaloq.tools.ddk.xtext.format.ide/.classpath b/com.avaloq.tools.ddk.xtext.format.ide/.classpath
index e234cda01d..beab4a2534 100644
--- a/com.avaloq.tools.ddk.xtext.format.ide/.classpath
+++ b/com.avaloq.tools.ddk.xtext.format.ide/.classpath
@@ -7,7 +7,6 @@
 		</accessrules>
 	</classpathentry>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="xtend-gen"/>
 	<classpathentry kind="src" path="src-gen">
 		<attributes>
 			<attribute name="ignore_optional_problems" value="true"/>
diff --git a/com.avaloq.tools.ddk.xtext.format.ide/.project b/com.avaloq.tools.ddk.xtext.format.ide/.project
index a0bf91cdd4..adfcc20778 100644
--- a/com.avaloq.tools.ddk.xtext.format.ide/.project
+++ b/com.avaloq.tools.ddk.xtext.format.ide/.project
@@ -20,11 +20,6 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 		<buildCommand>
 			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
 			<arguments>
@@ -44,7 +39,6 @@
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
 		<nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature>
 		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
 		<nature>edu.umd.cs.findbugs.plugin.eclipse.findbugsNature</nature>
diff --git a/com.avaloq.tools.ddk.xtext.format.ide/build.properties b/com.avaloq.tools.ddk.xtext.format.ide/build.properties
index bef28d3d93..ec65859a4c 100644
--- a/com.avaloq.tools.ddk.xtext.format.ide/build.properties
+++ b/com.avaloq.tools.ddk.xtext.format.ide/build.properties
@@ -1,5 +1,4 @@
 source.. = src/,\
-           src-gen/,\
-           xtend-gen/
+           src-gen/
 bin.includes = META-INF/,\
                .
diff --git a/com.avaloq.tools.ddk.xtext.format.ide/src/com/avaloq/tools/ddk/xtext/format/ide/FormatIdeModule.java b/com.avaloq.tools.ddk.xtext.format.ide/src/com/avaloq/tools/ddk/xtext/format/ide/FormatIdeModule.java
new file mode 100644
index 0000000000..dcc64a7720
--- /dev/null
+++ b/com.avaloq.tools.ddk.xtext.format.ide/src/com/avaloq/tools/ddk/xtext/format/ide/FormatIdeModule.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Avaloq Group AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Avaloq Group AG - initial API and implementation
+ *******************************************************************************/
+package com.avaloq.tools.ddk.xtext.format.ide;
+
+
+/**
+ * Use this class to register ide components.
+ */
+public class FormatIdeModule extends AbstractFormatIdeModule {
+}
diff --git a/com.avaloq.tools.ddk.xtext.format.ide/src/com/avaloq/tools/ddk/xtext/format/ide/FormatIdeModule.xtend b/com.avaloq.tools.ddk.xtext.format.ide/src/com/avaloq/tools/ddk/xtext/format/ide/FormatIdeModule.xtend
deleted file mode 100644
index c1b043e69a..0000000000
--- a/com.avaloq.tools.ddk.xtext.format.ide/src/com/avaloq/tools/ddk/xtext/format/ide/FormatIdeModule.xtend
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * generated by Xtext 2.26
- */
-package com.avaloq.tools.ddk.xtext.format.ide
-
-
-/**
- * Use this class to register ide components.
- */
-class FormatIdeModule extends AbstractFormatIdeModule {
-}
diff --git a/com.avaloq.tools.ddk.xtext.format.ide/src/com/avaloq/tools/ddk/xtext/format/ide/FormatIdeSetup.java b/com.avaloq.tools.ddk.xtext.format.ide/src/com/avaloq/tools/ddk/xtext/format/ide/FormatIdeSetup.java
new file mode 100644
index 0000000000..2bf75001de
--- /dev/null
+++ b/com.avaloq.tools.ddk.xtext.format.ide/src/com/avaloq/tools/ddk/xtext/format/ide/FormatIdeSetup.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Avaloq Group AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Avaloq Group AG - initial API and implementation
+ *******************************************************************************/
+package com.avaloq.tools.ddk.xtext.format.ide;
+
+import org.eclipse.xtext.util.Modules2;
+
+import com.avaloq.tools.ddk.xtext.format.FormatRuntimeModule;
+import com.avaloq.tools.ddk.xtext.format.FormatStandaloneSetup;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+
+/**
+ * Initialization support for running Xtext languages as language servers.
+ */
+public class FormatIdeSetup extends FormatStandaloneSetup {
+
+  @Override
+  public Injector createInjector() {
+    return Guice.createInjector(Modules2.mixin(new FormatRuntimeModule(), new FormatIdeModule()));
+  }
+
+}
diff --git a/com.avaloq.tools.ddk.xtext.format.ide/src/com/avaloq/tools/ddk/xtext/format/ide/FormatIdeSetup.xtend b/com.avaloq.tools.ddk.xtext.format.ide/src/com/avaloq/tools/ddk/xtext/format/ide/FormatIdeSetup.xtend
deleted file mode 100644
index 9bf11b9754..0000000000
--- a/com.avaloq.tools.ddk.xtext.format.ide/src/com/avaloq/tools/ddk/xtext/format/ide/FormatIdeSetup.xtend
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * generated by Xtext 2.25.0
- */
-package com.avaloq.tools.ddk.xtext.format.ide
-
-import com.avaloq.tools.ddk.xtext.format.FormatRuntimeModule
-import com.avaloq.tools.ddk.xtext.format.FormatStandaloneSetup
-import com.google.inject.Guice
-import org.eclipse.xtext.util.Modules2
-
-/**
- * Initialization support for running Xtext languages as language servers.
- */
-class FormatIdeSetup extends FormatStandaloneSetup {
-
-  override createInjector() {
-    Guice.createInjector(Modules2.mixin(new FormatRuntimeModule, new FormatIdeModule))
-  }
-
-}
diff --git a/com.avaloq.tools.ddk.xtext.format.ide/xtend-gen/.gitignore b/com.avaloq.tools.ddk.xtext.format.ide/xtend-gen/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000