diff --git a/src/org/oscim/theme/renderinstruction/Text.java b/src/org/oscim/theme/renderinstruction/Text.java
index 9790d262..80c2b93f 100644
--- a/src/org/oscim/theme/renderinstruction/Text.java
+++ b/src/org/oscim/theme/renderinstruction/Text.java
@@ -60,7 +60,7 @@ public final class Text extends RenderInstruction {
 			if ("name".equals(name))
 				style = value;
 			else if ("k".equals(name)) {
-				textKey = TextKey.getInstance(value);
+				textKey = value.intern();
 			} else if ("font-family".equals(name)) {
 				fontFamily = FontFamily.valueOf(value.toUpperCase(Locale.ENGLISH));
 			} else if ("font-style".equals(name)) {
diff --git a/src/org/oscim/theme/renderinstruction/TextKey.java b/src/org/oscim/theme/renderinstruction/TextKey.java
deleted file mode 100644
index ebaf16da..00000000
--- a/src/org/oscim/theme/renderinstruction/TextKey.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2010, 2011, 2012 mapsforge.org
- *
- * This program is free software: you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free Software
- * Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with
- * this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.oscim.theme.renderinstruction;
-
-import org.oscim.core.Tag;
-
-final class TextKey {
-	static String getInstance(String key) {
-		if (Tag.TAG_KEY_ELE.equals(key)) {
-			return Tag.TAG_KEY_ELE;
-		} else if (Tag.TAG_KEY_HOUSE_NUMBER.equals(key)) {
-			return Tag.TAG_KEY_HOUSE_NUMBER;
-		} else if (Tag.TAG_KEY_NAME.equals(key)) {
-			return Tag.TAG_KEY_NAME;
-		} else if (Tag.TAG_KEY_REF.equals(key)) {
-			return Tag.TAG_KEY_REF;
-		} else {
-			throw new IllegalArgumentException("invalid key: " + key);
-		}
-	}
-}