diff --git a/plugins/org.eclipse.xtext/META-INF/MANIFEST.MF b/plugins/org.eclipse.xtext/META-INF/MANIFEST.MF
index 775bc3e62..daa6e1891 100644
--- a/plugins/org.eclipse.xtext/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.xtext/META-INF/MANIFEST.MF
@@ -100,7 +100,6 @@ Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="2.10.2";visibility:=re
  org.eclipse.xtend;bundle-version="1.1.0";resolution:=optional;x-installation:=greedy,
  org.eclipse.xtend.typesystem.emf;bundle-version="1.0.1";resolution:=optional;x-installation:=greedy,
  org.eclipse.xtext.util;visibility:=reexport,
- org.eclipse.xtext.smap;x-installation:=greedy,
  org.eclipse.core.runtime;bundle-version="3.6.0";resolution:=optional;x-installation:=greedy,
  org.eclipse.xtend.lib;resolution:=optional,
  org.eclipse.equinox.common;bundle-version="3.5.0"
diff --git a/plugins/org.eclipse.xtext/build.gradle b/plugins/org.eclipse.xtext/build.gradle
index 68e8e97c1..a185be128 100644
--- a/plugins/org.eclipse.xtext/build.gradle
+++ b/plugins/org.eclipse.xtext/build.gradle
@@ -1,6 +1,5 @@
 dependencies {
 	compile project(':org.eclipse.xtext.util')
-	compile project(':org.eclipse.xtext.smap') // TODO eliminate dependency
 	compile "org.eclipse.xtend:org.eclipse.xtend.lib:$versions.xtext"
     compile "log4j:log4j:$versions.log4j"
 	compile "org.eclipse.equinox:org.eclipse.equinox.common:$versions.equinoxCommon"
diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/TraceAsSmapInstaller.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/TraceAsSmapInstaller.java
deleted file mode 100644
index 73770380c..000000000
--- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/TraceAsSmapInstaller.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 itemis AG (http://www.itemis.eu) 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
- *******************************************************************************/
-package org.eclipse.xtext.generator.trace;
-
-import static com.google.common.collect.Maps.*;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.log4j.Logger;
-import org.eclipse.xtext.LanguageInfo;
-import org.eclipse.xtext.generator.trace.LineMappingProvider.LineMapping;
-import org.eclipse.xtext.resource.IResourceServiceProvider;
-import org.eclipse.xtext.smap.SDEInstaller;
-import org.eclipse.xtext.smap.SmapGenerator;
-import org.eclipse.xtext.smap.SmapStratum;
-
-import com.google.inject.Inject;
-
-/**
- * @author Sven Efftinge - Initial contribution and API
- */
-public class TraceAsSmapInstaller implements ITraceToBytecodeInstaller {
-
-	@SuppressWarnings("unused")
-	private static final Logger log = Logger.getLogger(TraceAsSmapInstaller.class);
-
-	@Inject
-	private LineMappingProvider lineMappingProvider;
-
-	@Inject
-	private IResourceServiceProvider.Registry serviceProviderRegistry;
-	
-	protected String smap;
-
-	protected String generateSmap(AbstractTraceRegion rootTraceRegion, String outputFileName) {
-		List<LineMapping> lineInfo = lineMappingProvider.getLineMapping(rootTraceRegion);
-		if (lineInfo == null || lineInfo.isEmpty())
-			return null;
-		return toSmap(outputFileName, lineInfo);
-	}
-
-	protected String getStratumName(final SourceRelativeURI path) {
-		IResourceServiceProvider provider = serviceProviderRegistry.getResourceServiceProvider(path.getURI());
-		if (provider == null) {
-			// it might happen that trace data is in the workspace but the corresponding language is not installed.
-			// we use the file extension then.
-			String result = path.getURI().fileExtension();
-			if (result != null) {
-				return result;
-			}
-			return "unknown";
-		}
-		final LanguageInfo languageInfo = provider.get(LanguageInfo.class);
-		String name = languageInfo.getShortName();
-		return name;
-	}
-
-	@Override
-	public byte[] installTrace(byte[] javaClassBytecode) throws IOException {
-		if (smap == null)
-			return null;
-		byte[] updatedByteCode = new SDEInstaller(javaClassBytecode, smap.getBytes()).getUpdatedByteCode();
-		return updatedByteCode;
-	}
-
-	@Override
-	public void setTrace(String javaFileName, AbstractTraceRegion trace) {
-		smap = generateSmap(trace, javaFileName);
-	}
-
-	protected String toSmap(String outputFileName, List<LineMapping> lineInfo) {
-		SmapGenerator generator = new SmapGenerator();
-		generator.setOutputFileName(outputFileName);
-		Map<String, SmapStratum> strata = newHashMap();
-		for (LineMapping lm : lineInfo) {
-			String stratumName = getStratumName(lm.source);
-			if (!"Java".equals(stratumName)) {
-				final String path = lm.source.getURI().path();
-				if (path != null) {
-					SmapStratum stratum = strata.get(stratumName);
-					if (stratum == null) {
-						stratum = new SmapStratum(stratumName);
-						strata.put(stratumName, stratum);
-						generator.addStratum(stratum, true);
-					}
-					final String sourceFileName = lm.source.getURI().lastSegment();
-					stratum.addFile(sourceFileName, path);
-					stratum.addLineData(lm.sourceStartLine, sourceFileName, 1, lm.targetStartLine + 1, lm.targetEndLine
-							- lm.targetStartLine + 1);
-				}
-			}
-		}
-		return generator.getString();
-	}
-}