diff --git a/Releasenotes.md b/Releasenotes.md
index 9f6f076..dd4d517 100644
--- a/Releasenotes.md
+++ b/Releasenotes.md
@@ -186,6 +186,9 @@ Feature Release 4.1.0
 Major Release 5.0.0
 ===================
 
+Date: 07.11.2017
+Tag: 5.0.0
+
 * Breaking Change: Completely removed Abstraction over Template types, only interpreted survives
 * Breaking Change: Removed all API deprecated in version 4
 * Breaking Change: Switch to Java 8 language level
diff --git a/build.xml b/build.xml
index 17ec5a7..447375a 100644
--- a/build.xml
+++ b/build.xml
@@ -14,9 +14,7 @@
 	<property name="final.name" value="${name}-${version}" />
 	<property name="nocompiler.name" value="${final.name}" />
 	<property name="dist.name" value="${name}-${version}-full.zip" />
-	<property name="jar.name" value="${final.name}-bundled.jar" />
 	<property name="nocompiler.jar.name" value="${nocompiler.name}.jar" />
-	<property name="asm" value="lib/asm-3.3.1.jar" />
 
 	<tstamp>
 		<format property="TODAY.DATE" pattern="yyyy-MM-dd" locale="us" />
@@ -94,10 +92,10 @@
 		</copy>
 	</target>
 
-	<!-- 
+	<!--
+  ===================================================================
+  Archive the code
   ===================================================================
-  Archive the code           
-  =================================================================== 
   -->
 	<target name="archive-jars" depends="build" description="Builds the exectutable jar-archives">
 		<jar destfile="${dist.dir}/${nocompiler.jar.name}" filesetmanifest="skip">
@@ -108,23 +106,7 @@
 				<attribute name="Build-Date" value="${today}" />
 			</manifest>
 			<fileset dir="${build.dir}" excludes="**/*Test*.class,**/*Tests*.class,**/sample/**,tmp/**" />
-		</jar>	
-
-		<taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="lib/jarjar-1.0.jar" />
-
-		<jarjar jarfile="${dist.dir}/${jar.name}">
-			<manifest>
-				<attribute name="Built-By" value="${creator}" />
-				<attribute name="Main-Class" value="${main-class}" />
-				<attribute name="Version" value="${version}" />
-				<attribute name="Build-Date" value="${today}" />
-			</manifest>
-			<zipfileset src="${dist.dir}/${nocompiler.jar.name}" />
-			<zipfileset src="${asm}" />
-			<rule pattern="org.objectweb.asm.**" result="com.floreysoft.jmte.internal.asm.@1" />
-			<keep pattern="com.floreysoft.jmte.**" />
-		</jarjar>
-
+		</jar>
 	</target>
 
 	<!--
@@ -150,8 +132,8 @@
 			<zipfileset dir="${src.dir}" prefix="${final.name}/src" />
 			<zipfileset dir="${doc.dir}" prefix="${final.name}/doc" />
 			<zipfileset dir="${lib.dir}" prefix="${final.name}/lib" />
-			<zipfileset dir="${dist.dir}" includes="${jar.name}, ${nocompiler.jar.name}" prefix="${final.name}" />
-			<zipfileset dir="${basedir}" includes="build.xml, Caliper*, common.properties, COPYING, local.properties.sample, Releasenotes.txt" prefix="${final.name}" />
+			<zipfileset dir="${dist.dir}" includes="${nocompiler.jar.name}" prefix="${final.name}" />
+			<zipfileset dir="${basedir}" includes="build.xml, common.properties, COPYING, local.properties.sample, Releasenotes.md" prefix="${final.name}" />
 		</zip>
 	</target>
 
diff --git a/caliper/Caliper-Compiled-Engine-Reports.txt b/caliper/Caliper-Compiled-Engine-Reports.txt
deleted file mode 100644
index d46ea76..0000000
--- a/caliper/Caliper-Compiled-Engine-Reports.txt
+++ /dev/null
@@ -1,161 +0,0 @@
-Dell Latitude E5510, i5 M520@2.4GHz, 4,00 GB, Windows 7 Professional, 32 bit, JDK 1.6.0_20
-
-13.01.2011 (svn rev 95)
-========================
-                          benchmark    us logarithmic runtime
-          SimpleExpressionReference  6,44 ================
-  PrototypeCompiledSimpleExpression  3,66 ========
-         ComplexExpressionReference  6,93 =================
- PrototypeCompiledComplexExpression  3,69 ========
-                                 If  9,75 ======================
-      PrototypeCompiledIfExpression  2,17 =
-                            Foreach 16,63 ==============================
- PrototypeCompiledForeachExpression  7,98 ===================
-
-
-24.01.2011 first complete compiler version
-(svn rev 120)
-==========================================
-
-                          benchmark    ns logarithmic runtime
-          SimpleExpressionReference  3367 ================
-           SimpleExpressionCompiled   963 ==
-  PrototypeCompiledSimpleExpression  4165 ==================
-         ComplexExpressionReference  6721 =======================
-          ComplexExpressionCompiled  1331 ======
- PrototypeCompiledComplexExpression  4197 ==================
-                                 If  7067 =======================
-                         IfCompiled   805 =
-      PrototypeCompiledIfExpression  2894 ==============
-                            Foreach 12796 =============================
-                    ForeachCompiled  5275 ====================
- PrototypeCompiledForeachExpression  8485 =========================
- 
-25.01.2011 (svn tag 2.0-rc1 / rev 135)
-==========================================
-
-                          benchmark    ns logarithmic runtime
-          SimpleExpressionReference  3404 ===============
-           SimpleExpressionCompiled   973 ==
-  PrototypeCompiledSimpleExpression  3955 =================
-         ComplexExpressionReference  7316 =======================
-          ComplexExpressionCompiled  1356 ======
- PrototypeCompiledComplexExpression  3857 ================
-                                 If  7328 =======================
-                         IfCompiled   836 =
-      PrototypeCompiledIfExpression  2681 =============
-                            Foreach 13629 ==============================
-                    ForeachCompiled  5849 =====================
- PrototypeCompiledForeachExpression  8508 =========================
- 
-25.01.2011 after token stream caching for interpreter (svn tag rc2 / rev 138)
-=============================================================================
-
-                          benchmark    ns logarithmic runtime
-          SimpleExpressionReference  3420 ===============
-             SimpleExpressionCached  1010 ===
-           SimpleExpressionCompiled   972 ==
- PrototypeCompiledSimpleExpression  3857 =================
-         ComplexExpressionReference  7073 =======================
-            ComplexExpressionCached  1275 =====
-          ComplexExpressionCompiled  1307 =====
- PrototypeCompiledComplexExpression  3821 =================
-                                 If  7132 =======================
-                           IfCached  1251 =====
-                         IfCompiled   810 =
-      PrototypeCompiledIfExpression  2628 =============
-                            Foreach 13210 ==============================
-                      ForeachCached  5953 =====================
-                    ForeachCompiled  5692 =====================
- PrototypeCompiledForeachExpression  8353 =========================
-
-26.01.2011 only caliper test changed now avoiding multiple
-creation of engines and templates to make comparison more fair (svn rev 141)
-=============================================================================
-
-                          benchmark    ns logarithmic runtime
-          SimpleExpressionReference  3340 ===============
-             SimpleExpressionCached   958 ==
-           SimpleExpressionCompiled   933 ==
-  PrototypeCompiledSimpleExpression  1327 ======
-         ComplexExpressionReference  6958 =======================
-            ComplexExpressionCached  1327 ======
-          ComplexExpressionCompiled  1332 ======
- PrototypeCompiledComplexExpression  1320 ======
-                                 If  7075 =======================
-                           IfCached  1243 =====
-                         IfCompiled   804 =
-      PrototypeCompiledIfExpression  1252 =====
-                            Foreach 13713 ==============================
-                      ForeachCached  5684 ====================
-                    ForeachCompiled  5452 ====================
- PrototypeCompiledForeachExpression  5201 ====================
- 
-27.01.2011 internal lexer change for more accurate expr parsing
-(as a side effect seems to speed up parsing of if an foreach) (svn rev 147)
-=============================================================================
-
-                           benchmark    ns logarithmic runtime
-           SimpleExpressionReference  3245 ===============
-              SimpleExpressionCached   982 ===
-            SimpleExpressionCompiled   916 ==
-   PrototypeCompiledSimpleExpression  1217 =====
-          ComplexExpressionReference  6565 =======================
-             ComplexExpressionCached  1179 =====
-           ComplexExpressionCompiled  1173 =====
-  PrototypeCompiledComplexExpression  1495 =======
-                                  If  6340 =======================
-                            IfCached  1210 =====
-                          IfCompiled   799 =
-       PrototypeCompiledIfExpression  1231 =====
-                             Foreach 12161 ==============================
-                       ForeachCached  5826 ======================
-                     ForeachCompiled  5645 =====================
-  PrototypeCompiledForeachExpression  5462 =====================
- 
-30.01.2011 Reference measurement before reflection refactoring (svn rev 152)
-=============================================================================
-                          benchmark    ns logarithmic runtime
-          SimpleExpressionReference  3520 ================
-             SimpleExpressionCached   963 ==
-           SimpleExpressionCompiled   977 ==
-  PrototypeCompiledSimpleExpression  1276 =====
-                        JMTEReflect  5111 ====================
-                  JMTEReflectCached  1477 =======
-                JMTEReflectCompiled  1474 =======
-         ComplexExpressionReference  7057 =======================
-            ComplexExpressionCached  1213 ====
-          ComplexExpressionCompiled  1211 ====
- PrototypeCompiledComplexExpression  1564 =======
-                                 If  6667 ======================
-                           IfCached  1280 =====
-                         IfCompiled   836 =
-      PrototypeCompiledIfExpression  1272 =====
-                            Foreach 12926 ==============================
-                      ForeachCached  6143 ======================
-                    ForeachCompiled  5811 =====================
- PrototypeCompiledForeachExpression  5738 =====================
-
-30.01.2011 New object resolvation and caching reflection code without BeanInfo (svn rev 153)
-============================================================================================
-
-                          benchmark    ns logarithmic runtime
-          SimpleExpressionReference  3273 =================
-             SimpleExpressionCached   896 =====
-           SimpleExpressionCompiled   683 ==
-  PrototypeCompiledSimpleExpression  1163 =======
-                        JMTEReflect  5045 =====================
-                  JMTEReflectCached  1188 =======
-                JMTEReflectCompiled   952 =====
-         ComplexExpressionReference  6859 ========================
-            ComplexExpressionCached  1084 =======
-          ComplexExpressionCompiled   880 =====
- PrototypeCompiledComplexExpression  1434 =========
-                                 If  6512 ========================
-                           IfCached  1166 =======
-                         IfCompiled   577 =
-      PrototypeCompiledIfExpression   792 ====
-                            Foreach 12109 ==============================
-                      ForeachCached  5158 =====================
-                    ForeachCompiled  4237 ===================
- PrototypeCompiledForeachExpression  4194 ===================
diff --git a/caliper/Caliper-Engine-Reports.txt b/caliper/Caliper-Engine-Reports.txt
deleted file mode 100644
index 89df6f3..0000000
--- a/caliper/Caliper-Engine-Reports.txt
+++ /dev/null
@@ -1,205 +0,0 @@
-Dell Latitude E5510, i5 M520@2.4GHz, 4,00 GB, Windows 7 Professional, 32 bit, JDK 1.6.0_20
-
-JMTE 1.0
-========
-                             benchmark      ns logarithmic runtime
-                StringBuilderReference   453,3 ==============
-                 StringConcatReference   409,2 =============
-                       PrintfReference  2929,6 ======================
-                            Expression  7089,5 ==========================
-                     NativeIfReference    22,5 =
-                                    If  9690,3 ===========================
-                NativeForeachReference   336,2 ============
- NativeForeachNoStringBuilderReference   553,2 ===============
-                               Foreach 15850,0 ==============================
-
-
-03.01.2011
-==========
-              benchmark      ns logarithmic runtime
- StringBuilderReference   452,3 ===========
-  StringConcatReference   419,0 ===========
-        PrintfReference  3052,9 ==================
-             Expression 27318,1 =========================
-      NativeIfReference    23,4 =
-                     If 56660,2 ============================
- NativeForeachReference   337,5 ==========
-                Foreach 63719,5 ============================
-               Renderer 88577,5 ==============================
-
-05.01.2011, after performance refactoring (no more regexp)
-==========================================================
-
-                             benchmark      ns logarithmic runtime
-                StringBuilderReference   458,2 =============
-                 StringConcatReference   409,7 ============
-                       PrintfReference  2771,9 ====================
-                            Expression  7613,2 ========================
-                     NativeIfReference    22,7 =
-                                    If 15772,6 ===========================
-                NativeForeachReference   335,4 ===========
- NativeForeachNoStringBuilderReference   546,7 =============
-                              Foreach  24307,2 =============================
-                              Renderer 28773,4 ==============================
-
-06.01.2011, after more performance refactoring on WS split
-==========================================================
-
-                             benchmark      ns logarithmic runtime
-                StringBuilderReference   450,3 ==============
-                 StringConcatReference   404,8 =============
-                       PrintfReference  2789,4 ======================
-                            Expression  5894,7 =========================
-                     NativeIfReference    22,5 =
-                                    If  8686,7 ==========================
-                NativeForeachReference   336,1 ============
- NativeForeachNoStringBuilderReference   543,4 ==============
-                               Foreach 15493,3 =============================
-                              Renderer 17295,8 =============================
-
-07.01.2011, paying a performance penalty for the generally
-applied renderer architecture which now allows to override
-all rendering
-==========================================================
-
-                             benchmark      ns logarithmic runtime
-                StringBuilderReference   451,9 ==============
-                 StringConcatReference   407,0 =============
-                       PrintfReference  2793,0 ======================
-                            Expression  6798,6 ==========================
-                     NativeIfReference    22,5 =
-                                    If  9119,2 ===========================
-                NativeForeachReference   330,0 ============
- NativeForeachNoStringBuilderReference   548,5 ===============
-                               Foreach 15812,1 ==============================
-                              Renderer 14676,3 =============================
-                              
-12.01.2011, factored out Template interface to make
-execution configurable - preparing compilation
-also switched to javac (used to be internal
-Eclipse compiler for performance measurement)
-(svn rev 94)
-==========================================================
-
-                             benchmark      ns logarithmic runtime
-                StringBuilderReference   493,3 ==============
-                 StringConcatReference   491,7 ==============
-                       PrintfReference  2896,3 =====================
-                            Expression  7300,4 =========================
-                     NativeIfReference    22,3 =
-                                    If  9531,2 ==========================
-                NativeForeachReference   334,6 ============
- NativeForeachNoStringBuilderReference   511,2 ==============
-                               Foreach 17084,6 =============================
-                              Renderer 20125,9 =============================
-                              
-21.01.2011, various refactorings to enable compilation (svn rev 112)
-==========================================================
-
-                             benchmark      ns logarithmic runtime
-                StringBuilderReference   496,4 ==============
-                 StringConcatReference   495,7 ==============
-                       PrintfReference  3006,4 =====================
-                            Expression  7503,4 =========================
-                     NativeIfReference    22,1 =
-                                    If 10403,4 ===========================
-                NativeForeachReference   340,6 ============
- NativeForeachNoStringBuilderReference   512,9 ==============
-                               Foreach 16917,8 =============================
-                              Renderer 20263,1 ==============================
-                              
-22.01.2011, introduction of model adaptor (svn rev 113)
-==========================================================
-
-                             benchmark      ns logarithmic runtime
-                StringBuilderReference   499,2 ==============
-                 StringConcatReference   496,6 ==============
-                       PrintfReference  2931,0 =====================
-                            Expression  7505,5 =========================
-                     NativeIfReference    22,3 =
-                                    If 10419,1 ===========================
-                NativeForeachReference   339,7 ============
- NativeForeachNoStringBuilderReference   518,6 ==============
-                               Foreach 16857,6 =============================
-                              Renderer 20277,4 ==============================
- 
-24.01.2011, after transition from stack based to recursive
-descent interpreter and new process listener concept
-(svn rev 119)
-=========================================================
-
-                             benchmark      ns logarithmic runtime
-                StringBuilderReference   500,6 ==============
-                 StringConcatReference   518,8 ==============
-                       PrintfReference  3057,0 =====================
-                            Expression  7422,8 =========================
-                     NativeIfReference    22,4 =
-                                    If  9064,5 ==========================
-                NativeForeachReference   345,8 ============
- NativeForeachNoStringBuilderReference   516,6 ==============
-                               Foreach 16663,3 =============================
-                              Renderer 20393,9 ==============================
-
-25.01.2011 (svn tag 2.0-rc1 / rev 135)
-=========================================================
-                             benchmark      ns logarithmic runtime
-                StringBuilderReference   512,4 ==============
-                 StringConcatReference   503,0 ==============
-                       PrintfReference  3066,9 =====================
-                            Expression  7083,4 =========================
-                     NativeIfReference    22,8 =
-                                    If  8657,5 ==========================
-                NativeForeachReference   354,1 ============
- NativeForeachNoStringBuilderReference   531,0 ==============
-                               Foreach 17395,7 =============================
-                              Renderer 20914,9 ==============================
-
-                               
-25.01.2011 after token stream caching for interpreter - render
-is the only test that benefits from the caching as all other tests
-create a fresh engine with each run - see compiled caliper test for real
-speedup of caching
-(svn tag 2.0-rc2 / rev 138)
-===================================================================
-                             benchmark      ns logarithmic runtime
-                StringBuilderReference   484,9 ==============
-                 StringConcatReference   425,0 =============
-                       PrintfReference  3160,6 ======================
-                            Expression  7453,9 ==========================
-                     NativeIfReference    22,9 =
-                                    If  8883,9 ===========================
-                NativeForeachReference   346,8 ============
- NativeForeachNoStringBuilderReference   566,0 ===============
-                               Foreach 16898,1 ==============================
-                              Renderer  4472,6 ========================
-
-30.01.2011 New object resolvation and caching reflection code without BeanInfo (svn rev 153)
-============================================================================================
-                             benchmark      ns logarithmic runtime
-                StringBuilderReference   483,9 =============
-                 StringConcatReference   427,5 =============
-                       PrintfReference  3097,3 =====================
-                 EngineFormatReference  1504,0 ==================
-                            Expression  7470,5 =========================
-                     NativeIfReference    23,3 =
-                                    If  8062,1 =========================
-                NativeForeachReference   358,6 ============
- NativeForeachNoStringBuilderReference   572,6 ==============
-                               Foreach 18026,8 =============================
-                              Renderer 20747,7 ==============================
-
-
-02.02.2011 Single process listener and array list as template context scope (svn rev 174)
-=========================================================================================
-                             benchmark      ns logarithmic runtime
-                StringBuilderReference   498,2 ==============
-                 StringConcatReference   498,4 ==============
-                       PrintfReference  2872,7 =====================
-                 EngineFormatReference  1390,7 ==================
-                            Expression  7074,6 =========================
-                     NativeIfReference    21,9 =
-                                    If  7466,2 =========================
-                NativeForeachReference   339,5 ============
- NativeForeachNoStringBuilderReference   512,0 ==============
-                               Foreach 16973,5 =============================
-                              Renderer 19688,1 ==============================
diff --git a/caliper/Caliper-Large-Engine-Reports.txt b/caliper/Caliper-Large-Engine-Reports.txt
deleted file mode 100644
index 03c22dc..0000000
--- a/caliper/Caliper-Large-Engine-Reports.txt
+++ /dev/null
@@ -1,99 +0,0 @@
-Dell Latitude E5510, i5 M520@2.4GHz, 4,00 GB, Windows 7 Professional, 32 bit, JDK 1.6.0_20
-
-26.01.2011 introduction of large tests
-Shows that caching does not bring anything when using
-a large number of iterations (long). Compiling helps a little
-but much less than with few iterations.
-Having a bigger (and more realistic) template, both 
-compiler and cached versions again show a speedup
-which backs the decision to make caching a default
-in engine
-(svn rev 142)
-=====================================================
-
-                          benchmark       ns logarithmic runtime
-                    SimpleReference     3245 ====
-              SimpleCachedReference      912 =
-            SimpleCompiledReference      923 =
-                               Long  3641951 ========================
-                         LongCached  3619811 ========================
-                       LongCompiled  3332425 ========================
-                           LongText  1447678 =====================
-                     LongTextCached  1439558 =====================
-                   LongTextCompiled  1212149 =====================
-                       LongTemplate   172395 ===============
-                 LongTemplateCached    43713 ============
-               LongTemplateCompiled    45744 ============
-         LongTemplateManyIterations 24116407 =============================
-   LongTemplateManyIterationsCached 23869270 =============================
- LongTemplateManyIterationsCompiled 18409995 =============================
-
-27.01.2011 added real life example (svn rev 148)
-=====================================================
-
-                          benchmark       ns logarithmic runtime
-                    SimpleReference     3265 ====
-              SimpleCachedReference      967 =
-            SimpleCompiledReference      925 =
-                               Long  3730623 ========================
-                         LongCached  3695319 ========================
-                       LongCompiled  3301543 ========================
-                           LongText  1492679 ======================
-                     LongTextCached  1457202 =====================
-                   LongTextCompiled  1266020 =====================
-                       LongTemplate   153805 ===============
-                 LongTemplateCached    44545 ============
-               LongTemplateCompiled    37878 ===========
-         LongTemplateManyIterations 24398180 ==============================
-   LongTemplateManyIterationsCached 24136802 =============================
- LongTemplateManyIterationsCompiled 18699238 =============================
-                           RealLife   180144 ================
-                     RealLifeCached    87823 =============
-                   RealLifeCompiled    84166 =============
-
-30.01.2011 New object resolvation and caching reflection code without BeanInfo (svn rev 153)
-============================================================================================
-
-                          benchmark       ns logarithmic runtime
-                    SimpleReference     3282 =====
-              SimpleCachedReference      896 =
-            SimpleCompiledReference      662 =
-                               Long  3690506 ========================
-                         LongCached  3678096 ========================
-                       LongCompiled  2861785 ========================
-                           LongText  1557267 ======================
-                     LongTextCached  1484422 ======================
-                   LongTextCompiled  1323609 ======================
-                       LongTemplate   165715 ================
-                 LongTemplateCached    40992 ============
-               LongTemplateCompiled    29154 ===========
-         LongTemplateManyIterations 22796350 ==============================
-   LongTemplateManyIterationsCached 22719074 =============================
- LongTemplateManyIterationsCompiled 14081701 ============================
-                           RealLife   165077 ================
-                     RealLifeCached    65688 =============
-                   RealLifeCompiled    61031 =============
-
-02.02.2011 Single process listener and array list as template context scope (svn rev 174)
-=========================================================================================
-
-                          benchmark       ns logarithmic runtime
-                    SimpleReference     3194 =====
-              SimpleCachedReference      836 =
-            SimpleCompiledReference      716 =
-                               Long  3309833 =========================
-                         LongCached  3317210 =========================
-                       LongCompiled  2719714 ========================
-                          LongText  1370570 ======================
-                     LongTextCached  1385956 ======================
-                   LongTextCompiled  1256315 ======================
-                       LongTemplate   148032 ================
-                 LongTemplateCached    34681 ============
-               LongTemplateCompiled    26889 ===========
-         LongTemplateManyIterations 17822049 ==============================
-   LongTemplateManyIterationsCached 17448027 =============================
- LongTemplateManyIterationsCompiled 13247910 =============================
-                           RealLife   156732 ================
-                     RealLifeCached    61192 =============
-                   RealLifeCompiled    57962 =============
-                   
\ No newline at end of file
diff --git a/caliper/Caliper-MiniParser-Reports.txt b/caliper/Caliper-MiniParser-Reports.txt
deleted file mode 100644
index 365c0b9..0000000
--- a/caliper/Caliper-MiniParser-Reports.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-05.01.2011
-==========
-              benchmark   ns logarithmic runtime
- RegexpReplaceReference 1298 ==============================
-   CharReplaceReference  107 =
-                Replace  682 ======================
-
-06.01.2011
-==========
-              benchmark   ns logarithmic runtime
- RegexpReplaceReference 1283 =====================
-   CharReplaceReference  106 =
-                Replace  713 ================
-   RegexpSplitReference 1920 ========================
-                  Split 1049 ===================
-               SplitSet 1267 =====================
- RegexpWSSplitReference 3629 ==============================
-                WSSplit  512 =============
-                
\ No newline at end of file
diff --git a/lib/asm-3.3.1.jar b/lib/asm-3.3.1.jar
deleted file mode 100644
index baea9c8..0000000
Binary files a/lib/asm-3.3.1.jar and /dev/null differ
diff --git a/lib/caliper-0.0.jar b/lib/caliper-0.0.jar
deleted file mode 100644
index c384770..0000000
Binary files a/lib/caliper-0.0.jar and /dev/null differ
diff --git a/lib/caliper-1.0-SNAPSHOT-all.jar b/lib/caliper-1.0-SNAPSHOT-all.jar
deleted file mode 100644
index 024c3d0..0000000
Binary files a/lib/caliper-1.0-SNAPSHOT-all.jar and /dev/null differ
diff --git a/lib/jarjar-1.0.jar b/lib/jarjar-1.0.jar
deleted file mode 100644
index 89390bf..0000000
Binary files a/lib/jarjar-1.0.jar and /dev/null differ
diff --git a/src/com/floreysoft/jmte/Engine.java b/src/com/floreysoft/jmte/Engine.java
index 22bf0d8..acb87d1 100644
--- a/src/com/floreysoft/jmte/Engine.java
+++ b/src/com/floreysoft/jmte/Engine.java
@@ -87,16 +87,10 @@ public static Engine createEngine() {
 	private String exprEndToken = "}";
 	private double expansionSizeFactor = 2;
 	private ErrorHandler errorHandler = new DefaultErrorHandler();
-	private boolean useCompilation = false;
 	private ModelAdaptor modelAdaptor = new DefaultModelAdaptor();
 	private Encoder encoder = null;
 	private OutputAppender outputAppender = new DefaultOutputAppender();
 
-	private TemplateCompiler compiler;
-
-	// compiled templates cache lives as long as this engine
-	private final Map<String, Template> compiledTemplates = new HashMap<String, Template>();
-
 	private final Map<Class<?>, Renderer<?>> renderers = new HashMap<Class<?>, Renderer<?>>();
 	private final Map<Class<?>, Renderer<?>> resolvedRendererCache = new HashMap<Class<?>, Renderer<?>>();
 
@@ -415,14 +409,6 @@ public synchronized double getExpansionSizeFactor() {
 		return expansionSizeFactor;
 	}
 
-	public synchronized boolean isUseCompilation() {
-		return useCompilation;
-	}
-
-	public synchronized void setUseCompilation(boolean useCompilation) {
-		this.useCompilation = useCompilation;
-	}
-
 	public synchronized void setModelAdaptor(ModelAdaptor modelAdaptor) {
 		this.modelAdaptor = modelAdaptor;
 	}
@@ -452,29 +438,7 @@ public Template getTemplate(String template) {
 	 * @return the prepared template
 	 */
 	public Template getTemplate(String template, String sourceName) {
-		Template templateImpl;
-		if (useCompilation) {
-			templateImpl = compiledTemplates.get(template);
-			if (templateImpl == null) {
-				if (compiler == null) {
-					compiler = new DynamicBytecodeCompiler();
-				}
-				templateImpl = compiler.compile(template, sourceName, this);
-				compiledTemplates.put(template, templateImpl);
-			}
-			return templateImpl;
-		} else {
-			templateImpl = new InterpretedTemplate(template, sourceName, this);
-		}
-		return templateImpl;
-	}
-
-	public void setCompiler(TemplateCompiler compiler) {
-		this.compiler = compiler;
-	}
-
-	public TemplateCompiler getCompiler() {
-		return compiler;
+		return new InterpretedTemplate(template, sourceName, this);
 	}
 
 	public OutputAppender getOutputAppender() {
diff --git a/src/com/floreysoft/jmte/template/AbstractCompiledTemplate.java b/src/com/floreysoft/jmte/template/AbstractCompiledTemplate.java
deleted file mode 100644
index 634d095..0000000
--- a/src/com/floreysoft/jmte/template/AbstractCompiledTemplate.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package com.floreysoft.jmte.template;
-
-import java.util.*;
-
-import com.floreysoft.jmte.Engine;
-import com.floreysoft.jmte.ModelAdaptor;
-import com.floreysoft.jmte.ProcessListener;
-import com.floreysoft.jmte.ScopedMap;
-import com.floreysoft.jmte.TemplateContext;
-import com.floreysoft.jmte.message.ErrorEntry;
-import com.floreysoft.jmte.util.Util;
-
-public abstract class AbstractCompiledTemplate extends AbstractTemplate {
-
-	public AbstractCompiledTemplate() {
-	}
-
-	public AbstractCompiledTemplate(Engine engine) {
-		this.engine = engine;
-	}
-
-	@Override
-	public Set<String> getUsedVariables() {
-		return usedVariables;
-	}
-
-	@Override
-	public List<VariableDescription> getUsedVariableDescriptions() {
-		final List<VariableDescription> variableDescriptions = new ArrayList<>();
-		final Set<String> usedPlain = getUsedVariables();
-		if (usedPlain != null) {
-			for (String name : usedPlain) {
-				final VariableDescription variableDescription = new VariableDescription(name);
-				variableDescriptions.add(variableDescription);
-			}
-		}
-		return variableDescriptions;
-	}
-
-	@Override
-	public synchronized String transform(Map<String, Object> model, Locale locale, ModelAdaptor modelAdaptor, ProcessListener processListener) {
-		TemplateContext context = new TemplateContext(template, locale, sourceName,
-				new ScopedMap(model), modelAdaptor, engine, engine.getErrorHandler(), processListener);
-
-		String transformed = transformCompiled(context);
-		return transformed;
-
-	}
-
-	protected abstract String transformCompiled(TemplateContext context);
-
-	public void setEngine(Engine engine) {
-		this.engine = engine;
-	}
-
-	public Engine getEngine() {
-		return engine;
-	}
-
-	public void setTemplate(String template) {
-		this.template = template;
-	}
-
-	public String getTemplate() {
-		return template;
-	}
-
-	public void setSourceName(String sourceName) {
-		this.sourceName = sourceName;
-	}
-
-	public String getSourceName() {
-		return sourceName;
-	}
-
-	@Override
-	public String toString() {
-		return template;
-	}
-
-    @Override
-    public final List<ErrorEntry> getStaticErrors() {
-        throw new UnsupportedOperationException("Compiled templates do not support static error detection");
-    }
-}
diff --git a/src/com/floreysoft/jmte/template/DynamicBytecodeCompiler.java b/src/com/floreysoft/jmte/template/DynamicBytecodeCompiler.java
deleted file mode 100644
index b1b0cf6..0000000
--- a/src/com/floreysoft/jmte/template/DynamicBytecodeCompiler.java
+++ /dev/null
@@ -1,721 +0,0 @@
-package com.floreysoft.jmte.template;
-
-import static org.objectweb.asm.Opcodes.AASTORE;
-import static org.objectweb.asm.Opcodes.ACC_PROTECTED;
-import static org.objectweb.asm.Opcodes.ACC_PUBLIC;
-import static org.objectweb.asm.Opcodes.ACC_SUPER;
-import static org.objectweb.asm.Opcodes.ACONST_NULL;
-import static org.objectweb.asm.Opcodes.ALOAD;
-import static org.objectweb.asm.Opcodes.ANEWARRAY;
-import static org.objectweb.asm.Opcodes.ARETURN;
-import static org.objectweb.asm.Opcodes.ASTORE;
-import static org.objectweb.asm.Opcodes.ATHROW;
-import static org.objectweb.asm.Opcodes.BIPUSH;
-import static org.objectweb.asm.Opcodes.CHECKCAST;
-import static org.objectweb.asm.Opcodes.DUP;
-import static org.objectweb.asm.Opcodes.GETFIELD;
-import static org.objectweb.asm.Opcodes.GOTO;
-import static org.objectweb.asm.Opcodes.ICONST_0;
-import static org.objectweb.asm.Opcodes.ICONST_1;
-import static org.objectweb.asm.Opcodes.IFEQ;
-import static org.objectweb.asm.Opcodes.IFNE;
-import static org.objectweb.asm.Opcodes.INVOKEINTERFACE;
-import static org.objectweb.asm.Opcodes.INVOKESPECIAL;
-import static org.objectweb.asm.Opcodes.INVOKESTATIC;
-import static org.objectweb.asm.Opcodes.INVOKEVIRTUAL;
-import static org.objectweb.asm.Opcodes.NEW;
-import static org.objectweb.asm.Opcodes.POP;
-import static org.objectweb.asm.Opcodes.RETURN;
-import static org.objectweb.asm.Opcodes.V1_6;
-
-import java.io.StringWriter;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
-
-import com.floreysoft.jmte.message.ErrorMessage;
-import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.ClassWriter;
-import org.objectweb.asm.Label;
-import org.objectweb.asm.MethodVisitor;
-
-import com.floreysoft.jmte.Engine;
-import com.floreysoft.jmte.token.AnnotationToken;
-import com.floreysoft.jmte.token.ElseToken;
-import com.floreysoft.jmte.token.EndToken;
-import com.floreysoft.jmte.token.ForEachToken;
-import com.floreysoft.jmte.token.IfCmpToken;
-import com.floreysoft.jmte.token.IfToken;
-import com.floreysoft.jmte.token.InvalidToken;
-import com.floreysoft.jmte.token.PlainTextToken;
-import com.floreysoft.jmte.token.StringToken;
-import com.floreysoft.jmte.token.Token;
-import com.floreysoft.jmte.token.TokenStream;
-import com.floreysoft.jmte.util.UniqueNameGenerator;
-
-/**
- * 
- * @author olli
- * 
- * @see http://asm.ow2.org/
- * @see http://java.sun.com/docs/books/jvms/second_edition/html/ClassFile.doc.html
- * @see http://java.sun.com/docs/books/jvms/second_edition/html/Instructions.doc.html
- * @see http://stackoverflow.com/questions/148681/unloading-classes-in-java
- */
-public class DynamicBytecodeCompiler implements TemplateCompiler {
-
-	@SuppressWarnings("unchecked")
-	protected <T> Class<T> loadClass(byte[] b, Class<T> type) {
-		return cloadLoader.defineClass(null, b);
-	}
-
-	protected Class<?> loadClass(byte[] b) {
-		return cloadLoader.defineClass(null, b);
-	}
-
-	@SuppressWarnings("rawtypes")
-	private static class DelegatingClassLoader extends ClassLoader {
-		private final ClassLoader parentClassLoader;
-
-		public DelegatingClassLoader(ClassLoader parentClassLoader) {
-			this.parentClassLoader = parentClassLoader;
-		}
-
-		public Class defineClass(String name, byte[] b) {
-			return defineClass(name, b, 0, b.length);
-		}
-
-		@Override
-		public Class<?> loadClass(String name) throws ClassNotFoundException {
-			return parentClassLoader.loadClass(name);
-		}
-	};
-
-	private final static String COMPILED_TEMPLATE_NAME_PREFIX = "com/floreysoft/jmte/template/CompiledTemplate";
-
-	private final static int THIS = 0;
-	private final static int CONTEXT = 1;
-	private final static int BUFFER = 2;
-	private final static int EXCEPTION = 3;
-	private final static int HIGHEST = EXCEPTION;
-
-	// all the compiled classes live as long as this class loader lives
-	// this class loader lives as long as this compiler
-	private final DelegatingClassLoader cloadLoader = new DelegatingClassLoader(
-			DynamicBytecodeCompiler.class.getClassLoader());
-
-	private final UniqueNameGenerator<String, String> uniqueNameGenerator = new UniqueNameGenerator<String, String>(
-			COMPILED_TEMPLATE_NAME_PREFIX);
-
-	protected transient Set<String> usedVariables;
-	protected final List<String> localVarStack = new LinkedList<String>();
-	protected transient ClassVisitor classVisitor;
-	protected transient ClassWriter classWriter;
-	protected final String superClassName = "com/floreysoft/jmte/template/AbstractCompiledTemplate";
-	protected transient String className;
-	protected transient String typeDescriptor;
-	protected transient StringWriter writer;
-	protected transient MethodVisitor mv;
-
-	protected transient Label startLabel = new Label();
-	protected transient Label endLabel = new Label();
-
-	protected transient TokenStream tokenStream;
-	protected transient int tokenLocalVarIndex = HIGHEST + 1;
-
-	protected transient Engine engine;
-
-	private void initCompilation() {
-		usedVariables = new TreeSet<String>();
-		localVarStack.clear();
-		className = uniqueNameGenerator.nextUniqueName();
-		typeDescriptor = "L" + className + ";";
-		classWriter = new ClassWriter(ClassWriter.COMPUTE_FRAMES);
-		// only for debugging
-		// writer = new StringWriter();
-		// TraceClassVisitor traceClassVisitor = new TraceClassVisitor(
-		// classWriter, new PrintWriter(writer));
-		// classVisitor = new CheckClassAdapter(traceClassVisitor);
-		// classVisitor = traceClassVisitor;
-		classVisitor = classWriter;
-	}
-
-	private void addUsedVariableIfNotLocal(String variableName) {
-		if (!localVarStack.contains(variableName)) {
-			usedVariables.add(variableName);
-		}
-	}
-
-	private void foreach() {
-		ForEachToken feToken = (ForEachToken) tokenStream.currentToken();
-		tokenStream.consume();
-
-		localVarStack.add(0, feToken.getVarName());
-
-		Label loopStart = new Label();
-		Label loopEnd = new Label();
-		Label tryEndLabel = new Label();
-
-		codeGenerateForeachBlockStart(feToken, loopStart, loopEnd, tryEndLabel);
-
-		addUsedVariableIfNotLocal(feToken.getExpression());
-		Token contentToken;
-		while ((contentToken = tokenStream.currentToken()) != null
-				&& !(contentToken instanceof EndToken)) {
-			content();
-		}
-		if (contentToken == null) {
-			engine.getErrorHandler().error(ErrorMessage.MISSING_END, feToken);
-		} else {
-			tokenStream.consume();
-		}
-		codeGenerateForeachBlockEnd(loopStart, loopEnd, tryEndLabel);
-
-		localVarStack.remove(0);
-	}
-
-	private void condition() {
-		IfToken ifToken = (IfToken) tokenStream.currentToken();
-		tokenStream.consume();
-
-		Label tryEndLabel = new Label();
-		Label finalLabel = new Label();
-		Label elseLabel = new Label();
-
-		codeGenerateIfBlockStart(ifToken, tryEndLabel, elseLabel);
-
-		String variableName = ifToken.getExpression();
-		addUsedVariableIfNotLocal(variableName);
-		Token contentToken;
-
-		codeGenerateIfBranchStart();
-		while ((contentToken = tokenStream.currentToken()) != null
-				&& !(contentToken instanceof EndToken)
-				&& !(contentToken instanceof ElseToken)) {
-			content();
-		}
-		codeGenerateIfBranchEnd(finalLabel);
-
-		codeGenerateElseBranchStart(elseLabel);
-		if (contentToken instanceof ElseToken) {
-			tokenStream.consume();
-
-			while ((contentToken = tokenStream.currentToken()) != null
-					&& !(contentToken instanceof EndToken)) {
-				content();
-			}
-
-		}
-		codeGenerateElseBranchEnd(finalLabel);
-
-		if (contentToken == null) {
-			engine.getErrorHandler().error(ErrorMessage.MISSING_END, ifToken);
-		} else {
-			tokenStream.consume();
-		}
-
-		codeGenerateIfBlockEnd(tryEndLabel, finalLabel);
-	}
-
-	private void content() {
-		Token token = tokenStream.currentToken();
-		if (token instanceof PlainTextToken) {
-			PlainTextToken plainTextToken = (PlainTextToken) token;
-			tokenStream.consume();
-			String text = plainTextToken.getText();
-			codeGenerateText(text);
-		} else if (token instanceof StringToken) {
-			StringToken stringToken = (StringToken) token;
-			tokenStream.consume();
-			String variableName = stringToken.getExpression();
-			addUsedVariableIfNotLocal(variableName);
-			codeGenerateStringToken(stringToken);
-		} else if (token instanceof ForEachToken) {
-			foreach();
-		} else if (token instanceof IfToken) {
-			condition();
-		} else if (token instanceof ElseToken) {
-			tokenStream.consume();
-			engine.getErrorHandler().error(ErrorMessage.ELSE_OUT_OF_SCOPE, token);
-		} else if (token instanceof EndToken) {
-			tokenStream.consume();
-			engine.getErrorHandler().error(ErrorMessage.UNMATCHED_END, token, null);
-		} else if (token instanceof InvalidToken) {
-			tokenStream.consume();
-			engine.getErrorHandler().error(ErrorMessage.INVALID_EXPRESSION, token, null);
-		} else if (token instanceof AnnotationToken) {
-			tokenStream.consume();
-			codeGenerateAnnotationToken((AnnotationToken) token);
-		} else {
-			// what ever else there may be, we just ignore it
-			tokenStream.consume();
-		}
-
-	}
-
-	public Template compile(String template, String sourceName, Engine engine) {
-		try {
-		this.engine = engine;
-		initCompilation();
-		openCompilation();
-
-		tokenStream = new TokenStream(sourceName, template, engine
-				.getExprStartToken(), engine.getExprEndToken());
-		tokenStream.nextToken();
-		while (tokenStream.currentToken() != null) {
-			content();
-		}
-
-		closeCompilation();
-
-		classWriter.visitEnd();
-		classVisitor.visitEnd();
-
-		// FIXME: Only for debugging
-		// System.out.println(writer.toString());
-		byte[] byteArray = classWriter.toByteArray();
-		Class<?> myClass = loadClass(byteArray);
-		try {
-			AbstractCompiledTemplate compiledTemplate = (AbstractCompiledTemplate) myClass
-					.newInstance();
-			compiledTemplate.setEngine(engine);
-			compiledTemplate.setTemplate(template);
-			compiledTemplate.setSourceName(sourceName);
-			compiledTemplate.usedVariables = this.usedVariables;
-			return compiledTemplate;
-
-		} catch (InstantiationException e) {
-			throw new RuntimeException("Internal error " + e);
-		} catch (IllegalAccessException e) {
-			throw new RuntimeException("Internal error " + e);
-		}
-		} finally {
-			// free resources as soon as possible
-			this.engine = null;
-			this.tokenStream = null;
-		}
-	}
-
-	private void createCtor() {
-		// ctor no args
-		// public SampleSimpleExpressionCompiledTemplate()
-		MethodVisitor mv = classVisitor.visitMethod(ACC_PUBLIC, "<init>",
-				"()V", null, null);
-		mv.visitCode();
-		mv.visitVarInsn(ALOAD, THIS);
-		mv.visitMethodInsn(INVOKESPECIAL, superClassName, "<init>", "()V");
-		mv.visitInsn(RETURN);
-
-		// we can pass whatever we like as we have set
-		// ClassWriter.COMPUTE_FRAMES to ClassWriter
-		mv.visitMaxs(1, 1);
-		mv.visitEnd();
-
-	}
-
-	private void closeCompilation() {
-		returnStringBuilder();
-
-		mv.visitLabel(endLabel);
-
-		// we can pass whatever we like as we have set
-		// ClassWriter.COMPUTE_FRAMES to ClassWriter
-		mv.visitMaxs(1, 1);
-		mv.visitEnd();
-	}
-
-	// StringBuilder buffer = new StringBuilder();
-	private void createStringBuilder() {
-
-		mv.visitTypeInsn(NEW, "java/lang/StringBuilder");
-		mv.visitInsn(DUP);
-		mv.visitMethodInsn(INVOKESPECIAL, "java/lang/StringBuilder", "<init>",
-				"()V");
-		mv.visitVarInsn(ASTORE, BUFFER);
-	}
-
-	// return buffer.toString();
-
-	private void returnStringBuilder() {
-		mv.visitVarInsn(ALOAD, BUFFER);
-		mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/StringBuilder",
-				"toString", "()Ljava/lang/String;");
-		mv.visitInsn(ARETURN);
-	}
-
-	private void pushConstant(String parameter) {
-		if (parameter != null) {
-			mv.visitLdcInsn(parameter);
-		} else {
-			mv.visitInsn(ACONST_NULL);
-		}
-	}
-
-	private void openCompilation() {
-
-		classVisitor.visit(V1_6, ACC_PUBLIC + ACC_SUPER, className, null,
-				superClassName, null);
-
-		createCtor();
-
-		mv = classVisitor.visitMethod(ACC_PROTECTED, "transformCompiled",
-				"(Lcom/floreysoft/jmte/TemplateContext;)Ljava/lang/String;",
-				null, null);
-
-		mv.visitCode();
-		mv.visitLabel(startLabel);
-		createStringBuilder();
-	}
-
-	private void codeGenerateAnnotationToken(AnnotationToken annotationToken) {
-
-		mv.visitVarInsn(ALOAD, BUFFER);
-		mv.visitTypeInsn(NEW, "com/floreysoft/jmte/token/AnnotationToken");
-		mv.visitInsn(DUP);
-		pushConstant(annotationToken.getReceiver());
-		pushConstant(annotationToken.getArguments());
-		mv.visitMethodInsn(INVOKESPECIAL,
-				"com/floreysoft/jmte/token/AnnotationToken", "<init>",
-				"(Ljava/lang/String;Ljava/lang/String;)V");
-
-		mv.visitVarInsn(ALOAD, CONTEXT);
-		mv.visitMethodInsn(INVOKEVIRTUAL,
-				"com/floreysoft/jmte/token/AnnotationToken", "evaluate",
-				"(Lcom/floreysoft/jmte/TemplateContext;)Ljava/lang/Object;");
-		mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/Object", "toString",
-				"()Ljava/lang/String;");
-		mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/StringBuilder", "append",
-				"(Ljava/lang/String;)Ljava/lang/StringBuilder;");
-		mv.visitInsn(POP);
-
-	}
-
-	private void codeGenerateStringToken(StringToken stringToken) {
-
-		mv.visitVarInsn(ALOAD, BUFFER);
-		mv.visitTypeInsn(NEW, "com/floreysoft/jmte/token/StringToken");
-		mv.visitInsn(DUP);
-		pushConstant(stringToken.getExpression());
-		pushList(stringToken.getSegments());
-		pushConstant(stringToken.getExpression());
-		pushConstant(stringToken.getDefaultValue());
-		pushConstant(stringToken.getPrefix());
-		pushConstant(stringToken.getSuffix());
-		pushConstant(stringToken.getRendererName());
-		pushConstant(stringToken.getParameters());
-		mv
-				.visitMethodInsn(
-						INVOKESPECIAL,
-						"com/floreysoft/jmte/token/StringToken",
-						"<init>",
-						"(Ljava/lang/String;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V");
-
-		mv.visitVarInsn(ALOAD, CONTEXT);
-		mv.visitMethodInsn(INVOKEVIRTUAL,
-				"com/floreysoft/jmte/token/StringToken", "evaluate",
-				"(Lcom/floreysoft/jmte/TemplateContext;)Ljava/lang/Object;");
-		mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/Object", "toString",
-				"()Ljava/lang/String;");
-		mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/StringBuilder", "append",
-				"(Ljava/lang/String;)Ljava/lang/StringBuilder;");
-		mv.visitInsn(POP);
-
-	}
-
-	private void codeGenerateText(String text) {
-		mv.visitVarInsn(ALOAD, BUFFER);
-		pushConstant(text);
-		mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/StringBuilder", "append",
-				"(Ljava/lang/String;)Ljava/lang/StringBuilder;");
-		mv.visitInsn(POP);
-	}
-
-	private void codeGenerateElseBranchStart(Label elseLabel) {
-
-		// } else {
-		mv.visitLabel(elseLabel);
-	}
-
-	private void codeGenerateElseBranchEnd(Label finalLabel) {
-		// end of else branch
-		mv.visitJumpInsn(GOTO, finalLabel);
-
-	}
-
-	private void codeGenerateIfBranchStart() {
-		// TODO Auto-generated method stub
-
-	}
-
-	private void codeGenerateIfBranchEnd(Label finalLabel) {
-		// end of if branch
-		mv.visitJumpInsn(GOTO, finalLabel);
-	}
-
-	private void codeGenerateIfBlockEnd(Label tryEndLabel, Label finalLabel) {
-
-		tokenLocalVarIndex--;
-
-		// try end block rethrowing exception
-		mv.visitLabel(tryEndLabel);
-		mv.visitVarInsn(ASTORE, EXCEPTION);
-
-		codeGeneratePopContext();
-
-		mv.visitVarInsn(ALOAD, EXCEPTION);
-		mv.visitInsn(ATHROW);
-
-		// } finally {
-		mv.visitLabel(finalLabel);
-
-		// context.pop();
-
-		codeGeneratePopContext();
-
-	}
-
-	private void codeGenerateIfToken(IfToken ifToken) {
-		if (ifToken instanceof IfCmpToken) {
-
-			// IfCmpToken token1 = new IfCmpToken(Arrays
-			// .asList(new String[] { "address" }), "address", "Fillbert",
-			// false);
-			mv.visitTypeInsn(NEW, "com/floreysoft/jmte/token/IfCmpToken");
-			mv.visitInsn(DUP);
-			pushList(ifToken.getSegments());
-			pushConstant(ifToken.getExpression());
-			pushConstant(((IfCmpToken) ifToken).getOperand());
-			mv.visitInsn(ifToken.isNegated() ? ICONST_1 : ICONST_0);
-			mv.visitMethodInsn(INVOKESPECIAL,
-					"com/floreysoft/jmte/token/IfCmpToken", "<init>",
-					"(Ljava/util/List;Ljava/lang/String;Ljava/lang/String;Z)V");
-
-		} else {
-			// IfToken token1 = new IfToken(Arrays.asList(new String[] { "bean",
-			// "trueCond" }), "bean.trueCond", true);
-
-			mv.visitTypeInsn(NEW, "com/floreysoft/jmte/token/IfToken");
-			mv.visitInsn(DUP);
-			pushList(ifToken.getSegments());
-			pushConstant(ifToken.getExpression());
-			mv.visitInsn(ifToken.isNegated() ? ICONST_1 : ICONST_0);
-			mv.visitMethodInsn(INVOKESPECIAL,
-					"com/floreysoft/jmte/token/IfToken", "<init>",
-					"(Ljava/util/List;Ljava/lang/String;Z)V");
-
-		}
-		mv.visitVarInsn(ASTORE, tokenLocalVarIndex);
-
-	}
-
-	private void pushList(List<String> list) {
-		mv.visitIntInsn(BIPUSH, list.size());
-		mv.visitTypeInsn(ANEWARRAY, "java/lang/String");
-
-		for (int i = 0; i < list.size(); i++) {
-
-			mv.visitInsn(DUP);
-			mv.visitIntInsn(BIPUSH, i);
-			mv.visitLdcInsn(list.get(i));
-			mv.visitInsn(AASTORE);
-		}
-		mv.visitMethodInsn(INVOKESTATIC, "java/util/Arrays", "asList",
-				"([Ljava/lang/Object;)Ljava/util/List;");
-
-	}
-
-	private void codeGenerateIfBlockStart(IfToken ifToken, Label tryEndLabel,
-			Label elseLabel) {
-		Label tryStartLabel = new Label();
-
-		mv.visitTryCatchBlock(tryStartLabel, tryEndLabel, tryEndLabel, null);
-
-		codeGenerateIfToken(ifToken);
-
-		// context.push(token1);
-		mv.visitVarInsn(ALOAD, CONTEXT);
-		mv.visitVarInsn(ALOAD, tokenLocalVarIndex);
-		mv.visitMethodInsn(INVOKEVIRTUAL,
-				"com/floreysoft/jmte/TemplateContext", "push",
-				"(Lcom/floreysoft/jmte/token/Token;)V");
-
-		// try {
-
-		mv.visitLabel(tryStartLabel);
-		// token1.evaluate(context)
-		mv.visitVarInsn(ALOAD, tokenLocalVarIndex);
-		mv.visitVarInsn(ALOAD, CONTEXT);
-		mv.visitMethodInsn(INVOKEVIRTUAL, "com/floreysoft/jmte/token/IfToken",
-				"evaluate",
-				"(Lcom/floreysoft/jmte/TemplateContext;)Ljava/lang/Object;");
-
-		// (Boolean)
-		mv.visitTypeInsn(CHECKCAST, "java/lang/Boolean");
-		mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/Boolean", "booleanValue",
-				"()Z");
-
-		// if ((Boolean) token1.evaluate(context)) {
-		// if the condition is 0 meaning false
-		mv.visitJumpInsn(IFEQ, elseLabel);
-
-		tokenLocalVarIndex++;
-
-	}
-
-	private void codeGeneratePopContext() {
-		// context.pop();
-		mv.visitVarInsn(ALOAD, CONTEXT);
-		mv.visitMethodInsn(INVOKEVIRTUAL,
-				"com/floreysoft/jmte/TemplateContext", "pop",
-				"()Lcom/floreysoft/jmte/token/Token;");
-		mv.visitInsn(POP);
-	}
-
-	private void codeGenerateForeachBlockEnd(Label loopStart, Label loopEnd,
-			Label tryEndLabel) {
-
-		this.tokenLocalVarIndex--;
-
-		// if (!token1.isLast()) {
-		// buffer.append(token1.getSeparator());
-		// }
-		mv.visitVarInsn(ALOAD, this.tokenLocalVarIndex);
-		mv.visitMethodInsn(INVOKEVIRTUAL,
-				"com/floreysoft/jmte/token/ForEachToken", "isLast", "()Z");
-		mv.visitJumpInsn(IFNE, loopEnd);
-		mv.visitVarInsn(ALOAD, BUFFER);
-		mv.visitVarInsn(ALOAD, this.tokenLocalVarIndex);
-		mv.visitMethodInsn(INVOKEVIRTUAL,
-				"com/floreysoft/jmte/token/ForEachToken", "getSeparator",
-				"()Ljava/lang/String;");
-		mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/StringBuilder", "append",
-				"(Ljava/lang/String;)Ljava/lang/StringBuilder;");
-		mv.visitInsn(POP);
-
-		// while (token1.iterator().hasNext()) {
-		mv.visitLabel(loopEnd);
-		mv.visitVarInsn(ALOAD, this.tokenLocalVarIndex);
-		mv.visitMethodInsn(INVOKEVIRTUAL,
-				"com/floreysoft/jmte/token/ForEachToken", "iterator",
-				"()Ljava/util/Iterator;");
-		mv.visitMethodInsn(INVOKEINTERFACE, "java/util/Iterator", "hasNext",
-				"()Z");
-		mv.visitJumpInsn(IFNE, loopStart);
-
-		Label noExceptionFinallyLabel = new Label();
-		mv.visitJumpInsn(GOTO, noExceptionFinallyLabel);
-
-		// exception occurred => first finally block, then throw exception
-		mv.visitLabel(tryEndLabel);
-		mv.visitVarInsn(ASTORE, EXCEPTION);
-
-		codeGenerateExitScope();
-		codeGeneratePopContext();
-
-		mv.visitVarInsn(ALOAD, EXCEPTION);
-		mv.visitInsn(ATHROW);
-
-		// no exception occurred => execute finally block only
-		mv.visitLabel(noExceptionFinallyLabel);
-		codeGenerateExitScope();
-		codeGeneratePopContext();
-	}
-
-	private void codeGenerateForeachToken(ForEachToken feToken) {
-		// ForEachToken token1 = new ForEachToken(Arrays
-		// .asList(new String[] { "list" }),"list", "item", "\n");
-		mv.visitTypeInsn(NEW, "com/floreysoft/jmte/token/ForEachToken");
-		mv.visitInsn(DUP);
-		pushList(feToken.getSegments());
-		pushConstant(feToken.getExpression());
-		pushConstant(feToken.getVarName());
-		pushConstant(feToken.getSeparator());
-		mv
-				.visitMethodInsn(INVOKESPECIAL,
-						"com/floreysoft/jmte/token/ForEachToken", "<init>",
-						"(Ljava/util/List;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V");
-		mv.visitVarInsn(ASTORE, this.tokenLocalVarIndex);
-
-		// token1.setIterable((Iterable) token1.evaluate(context));
-		mv.visitVarInsn(ALOAD, this.tokenLocalVarIndex);
-		mv.visitVarInsn(ALOAD, this.tokenLocalVarIndex);
-		mv.visitVarInsn(ALOAD, CONTEXT);
-		mv.visitMethodInsn(INVOKEVIRTUAL,
-				"com/floreysoft/jmte/token/ForEachToken", "evaluate",
-				"(Lcom/floreysoft/jmte/TemplateContext;)Ljava/lang/Object;");
-		mv.visitTypeInsn(CHECKCAST, "java/lang/Iterable");
-		mv.visitMethodInsn(INVOKEVIRTUAL,
-				"com/floreysoft/jmte/token/ForEachToken", "setIterable",
-				"(Ljava/lang/Iterable;)V");
-
-	}
-
-	private void codeGenerateForeachBlockStart(ForEachToken feToken,
-			Label loopStart, Label loopEnd, Label tryEndLabel) {
-		Label tryStartLabel = new Label();
-		mv.visitTryCatchBlock(tryStartLabel, tryEndLabel, tryEndLabel, null);
-
-		codeGenerateForeachToken(feToken);
-
-		// context.model.enterScope();
-		mv.visitVarInsn(ALOAD, CONTEXT);
-		mv.visitFieldInsn(GETFIELD, "com/floreysoft/jmte/TemplateContext",
-				"model", "Lcom/floreysoft/jmte/ScopedMap;");
-		mv.visitMethodInsn(INVOKEVIRTUAL, "com/floreysoft/jmte/ScopedMap",
-				"enterScope", "()V");
-
-		// context.push(token1);
-		mv.visitVarInsn(ALOAD, CONTEXT);
-		mv.visitVarInsn(ALOAD, this.tokenLocalVarIndex);
-		mv.visitMethodInsn(INVOKEVIRTUAL,
-				"com/floreysoft/jmte/TemplateContext", "push",
-				"(Lcom/floreysoft/jmte/token/Token;)V");
-
-		// try {
-		mv.visitLabel(tryStartLabel);
-
-		// while (token1.iterator().hasNext()) {
-
-		mv.visitJumpInsn(GOTO, loopEnd);
-		mv.visitLabel(loopStart);
-
-		// context.model.put(token1.getVarName(), token1.advance());
-		mv.visitVarInsn(ALOAD, CONTEXT);
-		mv.visitFieldInsn(GETFIELD, "com/floreysoft/jmte/TemplateContext",
-				"model", "Lcom/floreysoft/jmte/ScopedMap;");
-		mv.visitVarInsn(ALOAD, this.tokenLocalVarIndex);
-		mv.visitMethodInsn(INVOKEVIRTUAL,
-				"com/floreysoft/jmte/token/ForEachToken", "getVarName",
-				"()Ljava/lang/String;");
-		mv.visitVarInsn(ALOAD, this.tokenLocalVarIndex);
-		mv.visitMethodInsn(INVOKEVIRTUAL,
-				"com/floreysoft/jmte/token/ForEachToken", "advance",
-				"()Ljava/lang/Object;");
-		mv.visitMethodInsn(INVOKEVIRTUAL, "com/floreysoft/jmte/ScopedMap",
-				"put",
-				"(Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/Object;");
-		mv.visitInsn(POP);
-
-		// addSpecialVariables(token1, context.model);
-		mv.visitVarInsn(ALOAD, THIS);
-		mv.visitVarInsn(ALOAD, this.tokenLocalVarIndex);
-		mv.visitVarInsn(ALOAD, CONTEXT);
-		mv.visitFieldInsn(GETFIELD, "com/floreysoft/jmte/TemplateContext",
-				"model", "Lcom/floreysoft/jmte/ScopedMap;");
-		mv.visitMethodInsn(INVOKEVIRTUAL, className, "addSpecialVariables",
-				"(Lcom/floreysoft/jmte/token/ForEachToken;Ljava/util/Map;)V");
-
-		this.tokenLocalVarIndex++;
-	}
-
-	private void codeGenerateExitScope() {
-		// context.model.exitScope();
-		mv.visitVarInsn(ALOAD, CONTEXT);
-		mv.visitFieldInsn(GETFIELD, "com/floreysoft/jmte/TemplateContext",
-				"model", "Lcom/floreysoft/jmte/ScopedMap;");
-		mv.visitMethodInsn(INVOKEVIRTUAL, "com/floreysoft/jmte/ScopedMap",
-				"exitScope", "()V");
-	}
-
-}
diff --git a/src/com/floreysoft/jmte/template/TemplateCompiler.java b/src/com/floreysoft/jmte/template/TemplateCompiler.java
deleted file mode 100644
index 4146403..0000000
--- a/src/com/floreysoft/jmte/template/TemplateCompiler.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.floreysoft.jmte.template;
-
-import com.floreysoft.jmte.Engine;
-
-/**
- * Compiles template source to an executable template.
- * 
- */
-public interface TemplateCompiler {
-	public Template compile(String template, String sourceName, Engine engine);
-}
diff --git a/test/com/floreysoft/jmte/EngineTest.java b/test/com/floreysoft/jmte/EngineTest.java
index 04cdc9b..81dbbf1 100644
--- a/test/com/floreysoft/jmte/EngineTest.java
+++ b/test/com/floreysoft/jmte/EngineTest.java
@@ -22,13 +22,6 @@
 import com.floreysoft.jmte.renderer.RawRenderer;
 import com.floreysoft.jmte.sample.NamedDateRenderer;
 import com.floreysoft.jmte.sample.NamedStringRenderer;
-import com.floreysoft.jmte.sample.SampleCompiledSequenceTemplate;
-import com.floreysoft.jmte.sample.SampleComplexExpressionCompiledTemplate;
-import com.floreysoft.jmte.sample.SampleIfCmpCompiledTemplate;
-import com.floreysoft.jmte.sample.SampleIfEmptyFalseExpressionCompiledTemplate;
-import com.floreysoft.jmte.sample.SampleNestedExpressionCompiledTemplate;
-import com.floreysoft.jmte.sample.SampleNewlineForeachSeparatorCompiledTemplate;
-import com.floreysoft.jmte.sample.SampleSimpleExpressionCompiledTemplate;
 import com.floreysoft.jmte.token.AnnotationToken;
 import com.floreysoft.jmte.token.ForEachToken;
 import com.floreysoft.jmte.token.Token;
@@ -1348,75 +1341,6 @@ public List<String> call() throws Exception {
 		assertEquals("i1, i2, i3", output);
 	}
 
-	@Test
-	public void compiledSimpleSample() throws Exception {
-		String input = "${address}";
-		String interpretedOutput = newEngine().transform(input, DEFAULT_MODEL);
-		String compiledOutput = new SampleSimpleExpressionCompiledTemplate(
-				newEngine()).transform(DEFAULT_MODEL, DEFAULT_LOCALE,
-				MODEL_ADAPTOR, null);
-		assertEquals(interpretedOutput, compiledOutput);
-	}
-
-	@Test
-	public void compiledComplexSample() throws Exception {
-		String input = "${<h1>,address(NIX),</h1>;long(full)}";
-		String interpretedOutput = ENGINE_WITH_CUSTOM_RENDERERS.transform(
-                input, DEFAULT_MODEL);
-		String compiledOutput = new SampleComplexExpressionCompiledTemplate(
-				ENGINE_WITH_CUSTOM_RENDERERS).transform(DEFAULT_MODEL,
-				DEFAULT_LOCALE, MODEL_ADAPTOR, null);
-		assertEquals(interpretedOutput, compiledOutput);
-	}
-
-	@Test
-	public void compiledIfSample() throws Exception {
-		String input = "${if !bean.trueCond}${address}${else}NIX${end}";
-		String interpretedOutput = newEngine().transform(input, DEFAULT_MODEL);
-		String compiledOutput = new SampleIfEmptyFalseExpressionCompiledTemplate(
-				newEngine()).transform(DEFAULT_MODEL, DEFAULT_LOCALE,
-				MODEL_ADAPTOR, null);
-		assertEquals(interpretedOutput, compiledOutput);
-	}
-
-	@Test
-	public void compiledForeachSample() throws Exception {
-		String input = "${ foreach list item \n}${item.property1}${end}";
-		String interpretedOutput = newEngine().transform(input, DEFAULT_MODEL);
-		String compiledOutput = new SampleNewlineForeachSeparatorCompiledTemplate(
-				newEngine()).transform(DEFAULT_MODEL, DEFAULT_LOCALE,
-                MODEL_ADAPTOR, null);
-		assertEquals(interpretedOutput, compiledOutput);
-	}
-
-	@Test
-	public void compiledSequenceSample() throws Exception {
-		String input = "PREFIX${<h1>,address(NIX),</h1>;long(full)}SUFFIX";
-		String interpretedOutput = newEngine().transform(input, DEFAULT_MODEL);
-		String compiledOutput = new SampleCompiledSequenceTemplate(newEngine())
-				.transform(DEFAULT_MODEL, DEFAULT_LOCALE, MODEL_ADAPTOR, null);
-		assertEquals(interpretedOutput, compiledOutput);
-	}
-
-	@Test
-	public void compiledNestedSample() throws Exception {
-		String input = "${foreach list item}${foreach item.list item2}OUTER_PRFIX${if item}${item2.property1}INNER_SUFFIX${end}${end}\n${end}";
-		String interpretedOutput = newEngine().transform(input, DEFAULT_MODEL);
-		String compiledOutput = new SampleNestedExpressionCompiledTemplate(
-				newEngine()).transform(DEFAULT_MODEL, DEFAULT_LOCALE,
-                MODEL_ADAPTOR, null);
-		assertEquals(interpretedOutput, compiledOutput);
-	}
-
-	@Test
-	public void compiledIfEqSample() throws Exception {
-		String input = "${if address='Filbert'}${address}${else}NIX${end}";
-		String interpretedOutput = newEngine().transform(input, DEFAULT_MODEL);
-		String compiledOutput = new SampleIfCmpCompiledTemplate(newEngine())
-				.transform(DEFAULT_MODEL, DEFAULT_LOCALE, MODEL_ADAPTOR, null);
-		assertEquals(interpretedOutput, compiledOutput);
-	}
-
 	@Test
 	public void longList() throws Exception {
 		String output = newEngine()
@@ -1869,14 +1793,6 @@ public void reader2String() throws Exception {
 		assertEquals(input, readerToString);
 	}
 
-	@Test
-	public void file2String() throws Exception {
-		String charsetName = "ISO-8859-15";
-		File file = new File("example/basic.mte");
-		String fileToString = Util.fileToString(file, charsetName);
-		assertEquals("${if address}${address}${else}NIX${end}", fileToString);
-	}
-
 	@Test
 	public void namedRendererRegistry() throws Exception {
 		NamedRenderer stringRenderer = ENGINE_WITH_NAMED_RENDERERS
diff --git a/test/com/floreysoft/jmte/HelperTest.java b/test/com/floreysoft/jmte/HelperTest.java
index 8a3b901..e2be74e 100644
--- a/test/com/floreysoft/jmte/HelperTest.java
+++ b/test/com/floreysoft/jmte/HelperTest.java
@@ -1,16 +1,16 @@
 package com.floreysoft.jmte;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
+import java.io.File;
 import java.util.List;
 import java.util.Set;
 
 import com.floreysoft.jmte.template.VariableDescription;
+import com.floreysoft.jmte.util.Util;
 import org.junit.Ignore;
 import org.junit.Test;
 
+import static org.junit.Assert.*;
+
 
 public final class HelperTest {
 	protected Engine newEngine() {
@@ -71,4 +71,12 @@ public void allVariableDescriptions() throws Exception {
 		}, output.toArray());
 	}
 
+	@Test
+	public void file2String() throws Exception {
+		String charsetName = "ISO-8859-15";
+		File file = new File("example/basic.mte");
+		String fileToString = Util.fileToString(file, charsetName);
+		assertEquals("${if address}${address}${else}NIX${end}", fileToString);
+	}
+
 }
diff --git a/test/com/floreysoft/jmte/sample/SampleCompiledSequenceTemplate.java b/test/com/floreysoft/jmte/sample/SampleCompiledSequenceTemplate.java
deleted file mode 100644
index 8efa25e..0000000
--- a/test/com/floreysoft/jmte/sample/SampleCompiledSequenceTemplate.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.floreysoft.jmte.sample;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import com.floreysoft.jmte.Engine;
-import com.floreysoft.jmte.TemplateContext;
-import com.floreysoft.jmte.template.AbstractCompiledTemplate;
-import com.floreysoft.jmte.token.StringToken;
-
-public class SampleCompiledSequenceTemplate extends AbstractCompiledTemplate {
-
-	public SampleCompiledSequenceTemplate(Engine engine) {
-		super(engine);
-	}
-
-	@Override
-	public Set<String> getUsedVariables() {
-		Set<String> usedVariables = new HashSet<String>();
-		usedVariables.add("address");
-		return usedVariables;
-	}
-
-	@Override
-	protected String transformCompiled(TemplateContext context) {
-		StringBuilder buffer = new StringBuilder();
-
-		buffer.append("PREFIX");
-
-		buffer.append(new StringToken("address", "address", "NIX", "<h1>",
-				"</h1>", "long", "full").evaluate(context));
-
-		buffer.append("SUFFIX");
-
-		return buffer.toString();
-	}
-
-}
diff --git a/test/com/floreysoft/jmte/sample/SampleComplexExpressionCompiledTemplate.java b/test/com/floreysoft/jmte/sample/SampleComplexExpressionCompiledTemplate.java
deleted file mode 100644
index 09a9849..0000000
--- a/test/com/floreysoft/jmte/sample/SampleComplexExpressionCompiledTemplate.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.floreysoft.jmte.sample;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import com.floreysoft.jmte.Engine;
-import com.floreysoft.jmte.TemplateContext;
-import com.floreysoft.jmte.template.AbstractCompiledTemplate;
-import com.floreysoft.jmte.token.StringToken;
-
-// ${<h1>,address(NIX),</h1>;long(full)}
-public class SampleComplexExpressionCompiledTemplate extends
-		AbstractCompiledTemplate {
-
-	public SampleComplexExpressionCompiledTemplate(Engine engine) {
-		super(engine);
-	}
-
-	@Override
-	public Set<String> getUsedVariables() {
-		Set<String> usedVariables = new HashSet<String>();
-		usedVariables.add("address");
-		return usedVariables;
-	}
-
-	@Override
-	protected String transformCompiled(TemplateContext context) {
-		StringBuilder buffer = new StringBuilder();
-
-		buffer.append(new StringToken("address", "address", "NIX", "<h1>",
-				"</h1>", "long", "full").evaluate(context));
-
-		return buffer.toString();
-	}
-
-}
diff --git a/test/com/floreysoft/jmte/sample/SampleIfCmpCompiledTemplate.java b/test/com/floreysoft/jmte/sample/SampleIfCmpCompiledTemplate.java
deleted file mode 100644
index 45ad028..0000000
--- a/test/com/floreysoft/jmte/sample/SampleIfCmpCompiledTemplate.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.floreysoft.jmte.sample;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-import com.floreysoft.jmte.Engine;
-import com.floreysoft.jmte.TemplateContext;
-import com.floreysoft.jmte.template.AbstractCompiledTemplate;
-import com.floreysoft.jmte.token.IfCmpToken;
-import com.floreysoft.jmte.token.StringToken;
-
-// ${if address='Fillbert'}${address}${else}NIX${end}
-public class SampleIfCmpCompiledTemplate extends AbstractCompiledTemplate {
-
-	public SampleIfCmpCompiledTemplate(Engine engine) {
-		super(engine);
-	}
-
-	@Override
-	public Set<String> getUsedVariables() {
-		Set<String> usedVariables = new HashSet<String>();
-		usedVariables.add("address");
-		return usedVariables;
-	}
-
-	@Override
-	protected String transformCompiled(TemplateContext context) {
-		StringBuilder buffer = new StringBuilder();
-
-		IfCmpToken token1 = new IfCmpToken(Arrays
-				.asList(new String[] { "address" }), "address", "Filbert",
-				false);
-
-		context.push(token1);
-		try {
-			if ((Boolean) token1.evaluate(context)) {
-				buffer.append(new StringToken("address", "address", null, null,
-						null, null, null).evaluate(context));
-			} else {
-				buffer.append("NIX");
-			}
-		} finally {
-			context.pop();
-		}
-		return buffer.toString();
-	}
-
-}
diff --git a/test/com/floreysoft/jmte/sample/SampleIfEmptyFalseExpressionCompiledTemplate.java b/test/com/floreysoft/jmte/sample/SampleIfEmptyFalseExpressionCompiledTemplate.java
deleted file mode 100644
index 560233b..0000000
--- a/test/com/floreysoft/jmte/sample/SampleIfEmptyFalseExpressionCompiledTemplate.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.floreysoft.jmte.sample;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-import com.floreysoft.jmte.Engine;
-import com.floreysoft.jmte.TemplateContext;
-import com.floreysoft.jmte.template.AbstractCompiledTemplate;
-import com.floreysoft.jmte.token.IfToken;
-import com.floreysoft.jmte.token.StringToken;
-
-// ${if !bean.trueCond}${address}${else}NIX${end}
-public class SampleIfEmptyFalseExpressionCompiledTemplate extends
-		AbstractCompiledTemplate {
-
-	public SampleIfEmptyFalseExpressionCompiledTemplate(Engine engine) {
-		super(engine);
-	}
-
-	@Override
-	public Set<String> getUsedVariables() {
-		Set<String> usedVariables = new HashSet<String>();
-		usedVariables.add("address");
-		return usedVariables;
-	}
-
-	@Override
-	protected String transformCompiled(TemplateContext context) {
-		StringBuilder buffer = new StringBuilder();
-
-		IfToken token1 = new IfToken(Arrays.asList(new String[] { "bean",
-				"trueCond" }), "bean.trueCond", true);
-
-		context.push(token1);
-		try {
-			if ((Boolean) token1.evaluate(context)) {
-				buffer.append(new StringToken("address", "address", null, null,
-						null, null, null).evaluate(context));
-			} else {
-				buffer.append("NIX");
-			}
-		} finally {
-			context.pop();
-		}
-		return buffer.toString();
-	}
-
-}
diff --git a/test/com/floreysoft/jmte/sample/SampleNestedExpressionCompiledTemplate.java b/test/com/floreysoft/jmte/sample/SampleNestedExpressionCompiledTemplate.java
deleted file mode 100644
index 9c8ea2d..0000000
--- a/test/com/floreysoft/jmte/sample/SampleNestedExpressionCompiledTemplate.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.floreysoft.jmte.sample;
-
-import java.util.Arrays;
-import java.util.TreeSet;
-
-import com.floreysoft.jmte.Engine;
-import com.floreysoft.jmte.TemplateContext;
-import com.floreysoft.jmte.template.AbstractCompiledTemplate;
-import com.floreysoft.jmte.token.ForEachToken;
-import com.floreysoft.jmte.token.IfToken;
-import com.floreysoft.jmte.token.StringToken;
-
-// ${foreach list item}${foreach item.list item2}OUTER_PRFIX${if item}${item2.property1}INNER_SUFFIX${end}${end}\n${end}
-public class SampleNestedExpressionCompiledTemplate extends
-		AbstractCompiledTemplate {
-
-	public SampleNestedExpressionCompiledTemplate() {
-	}
-
-	public SampleNestedExpressionCompiledTemplate(Engine engine) {
-		super(engine);
-		usedVariables = new TreeSet<String>();
-		usedVariables.add("address");
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	// ${foreach list item}${foreach item.list item2}OUTER_PRFIX
-	// ${if item}${item2.property1}INNER_SUFFIX${end}${end}\n${end}
-	protected String transformCompiled(TemplateContext context) {
-		StringBuilder buffer = new StringBuilder();
-
-		// ${foreach list item}
-		ForEachToken token1 = new ForEachToken("list", "item", "");
-		token1.setIterable((Iterable) token1.evaluate(context));
-		context.model.enterScope();
-		context.push(token1);
-		try {
-			while (token1.iterator().hasNext()) {
-				context.model.put(token1.getVarName(), token1.advance());
-				addSpecialVariables(token1, context.model);
-
-				// ${foreach item.list item2}
-				ForEachToken token2 = new ForEachToken(Arrays
-						.asList(new String[] { "item", "list" }), "item.list",
-						"item2", "");
-				token2.setIterable((Iterable) token2.evaluate(context));
-				context.model.enterScope();
-				context.push(token2);
-				try {
-					while (token2.iterator().hasNext()) {
-						context.model
-								.put(token2.getVarName(), token2.advance());
-						addSpecialVariables(token2, context.model);
-
-						// OUTER_PRFIX
-						buffer.append("OUTER_PRFIX");
-
-						// ${if item}
-						IfToken token3 = new IfToken("item", false);
-						context.push(token3);
-						try {
-							if ((Boolean) token3.evaluate(context)) {
-
-								// ${item2.property1}
-								buffer.append(new StringToken(Arrays
-										.asList(new String[] { "item2",
-												"property1" }),
-										"item.property1").evaluate(context));
-
-								// INNER_SUFFIX
-								buffer.append("INNER_SUFFIX");
-
-							}
-						} finally {
-							context.pop();
-						}
-
-						if (!token2.isLast()) {
-							buffer.append(token2.getSeparator());
-						}
-					}
-				} finally {
-					context.model.exitScope();
-					context.pop();
-				}
-
-				// \n
-				buffer.append("\n");
-				if (!token1.isLast()) {
-					buffer.append(token1.getSeparator());
-				}
-			}
-		} finally {
-			context.model.exitScope();
-			context.pop();
-		}
-		return buffer.toString();
-	}
-}
diff --git a/test/com/floreysoft/jmte/sample/SampleNewlineForeachSeparatorCompiledTemplate.java b/test/com/floreysoft/jmte/sample/SampleNewlineForeachSeparatorCompiledTemplate.java
deleted file mode 100644
index d9800d6..0000000
--- a/test/com/floreysoft/jmte/sample/SampleNewlineForeachSeparatorCompiledTemplate.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.floreysoft.jmte.sample;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-import com.floreysoft.jmte.Engine;
-import com.floreysoft.jmte.TemplateContext;
-import com.floreysoft.jmte.template.AbstractCompiledTemplate;
-import com.floreysoft.jmte.token.ForEachToken;
-import com.floreysoft.jmte.token.StringToken;
-
-// ${ foreach list item \n}${item.property1}${end}
-public class SampleNewlineForeachSeparatorCompiledTemplate extends
-		AbstractCompiledTemplate {
-
-	public SampleNewlineForeachSeparatorCompiledTemplate(Engine engine) {
-		super(engine);
-	}
-
-	@Override
-	public Set<String> getUsedVariables() {
-		Set<String> usedVariables = new HashSet<String>();
-		usedVariables.add("address");
-		return usedVariables;
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	protected String transformCompiled(TemplateContext context) {
-		StringBuilder buffer = new StringBuilder();
-
-		ForEachToken token1 = new ForEachToken(Arrays
-				.asList(new String[] { "list" }), "list", "item", "\n");
-		token1.setIterable((Iterable) token1.evaluate(context));
-
-		context.model.enterScope();
-		context.push(token1);
-		try {
-			while (token1.iterator().hasNext()) {
-				context.model.put(token1.getVarName(), token1.advance());
-				addSpecialVariables(token1, context.model);
-
-				buffer.append(new StringToken(Arrays.asList(new String[] {
-						"item", "property1" }), "item.property1")
-						.evaluate(context));
-
-				if (!token1.isLast()) {
-					buffer.append(token1.getSeparator());
-				}
-			}
-		} finally {
-			context.model.exitScope();
-			context.pop();
-		}
-		return buffer.toString();
-	}
-
-}
diff --git a/test/com/floreysoft/jmte/sample/SampleSimpleExpressionCompiledTemplate.java b/test/com/floreysoft/jmte/sample/SampleSimpleExpressionCompiledTemplate.java
deleted file mode 100644
index 756d8c6..0000000
--- a/test/com/floreysoft/jmte/sample/SampleSimpleExpressionCompiledTemplate.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.floreysoft.jmte.sample;
-
-import java.util.TreeSet;
-
-import com.floreysoft.jmte.Engine;
-import com.floreysoft.jmte.TemplateContext;
-import com.floreysoft.jmte.template.AbstractCompiledTemplate;
-import com.floreysoft.jmte.token.StringToken;
-
-// ${address}
-public class SampleSimpleExpressionCompiledTemplate extends
-		AbstractCompiledTemplate {
-
-	public SampleSimpleExpressionCompiledTemplate() {
-	}
-
-	public SampleSimpleExpressionCompiledTemplate(Engine engine) {
-		super(engine);
-		usedVariables = new TreeSet<String>();
-		usedVariables.add("address");
-	}
-
-	@Override
-	protected String transformCompiled(TemplateContext context) {
-		StringBuilder buffer = new StringBuilder();
-
-		buffer.append(new StringToken("address", "address", null, null, null,
-				null, null).evaluate(context));
-
-		return buffer.toString();
-	}
-
-}