diff --git a/core/src/main/java/org/jivesoftware/resource/ConfigurationRes.java b/core/src/main/java/org/jivesoftware/resource/ConfigurationRes.java
deleted file mode 100644
index ac98e2f1d..000000000
--- a/core/src/main/java/org/jivesoftware/resource/ConfigurationRes.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/**
- * Copyright (C) 2004-2011 Jive Software. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jivesoftware.resource;
-
-import org.jivesoftware.spark.util.log.Log;
-
-import javax.swing.ImageIcon;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Properties;
-
-public class ConfigurationRes {
-    private static final Properties prb;
-    public static final String GLOBAL_ELEMENT_NAME = "GLOBAL_ELEMENT_NAME";
-    public static final String DELETE_IMAGE = "DELETE_IMAGE";
-    public static final String PERSONAL_NAMESPACE = "PERSONAL_NAMESPACE";
-    public static final String HEADER_FILE = "HEADER_FILE";
-    public static final String CHECK_IMAGE = "CHECK_IMAGE";
-
-    public static final String SPELLING_PROPERTIES = "SPELLING_PROPERTIES";
-    public static final String PERSONAL_ELEMENT_NAME = "PERSONAL_ELEMENT_NAME";
-
-    private static final ClassLoader cl = ConfigurationRes.class.getClassLoader();
-
-    static {
-        prb = new Properties();
-        try
-        {
-            InputStream resourceAsStream = cl.getResourceAsStream( "configuration.properties" );
-            if (resourceAsStream != null) {
-                prb.load( resourceAsStream );
-            }
-        }
-        catch ( IOException e )
-        {
-            e.printStackTrace();
-        }
-    }
-
-    public static String getString(String propertyName) {
-        return prb.getProperty(propertyName);
-    }
-
-    public static ImageIcon getImageIcon(String imageName) {
-        try {
-            final String iconURI = getString(imageName);
-            final URL imageURL = cl.getResource(iconURI);
-            if (imageURL != null) {
-                return new ImageIcon(imageURL);
-            } else {
-                Log.warning(imageName + " not found.");
-            }
-        }
-        catch (Exception e) {
-            Log.warning("Unable to load image " + imageName, e);
-        }
-        return null;
-    }
-
-    public static URL getURL(String propertyName) {
-        return cl.getResource(getString(propertyName));
-    }
-}
diff --git a/core/src/main/resources/configuration.properties b/core/src/main/resources/configuration.properties
deleted file mode 100644
index 6cf7975eb..000000000
--- a/core/src/main/resources/configuration.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-# Default configurations for Live Assistant
-DEFAULT_APP_RESOURCE_NAME = Live Assistant
-
-#Images
-CHECK_IMAGE = images/check.png
-DELETE_IMAGE = images/delete.png
-HEADER_FILE = images/header.png
-
-#Namespaces
-PERSONAL_ELEMENT_NAME = private_macros
-PERSONAL_NAMESPACE = liveassistant:private
-
-GLOBAL_ELEMENT_NAME = global_macros
-GLOBAL_ELEMENT_NAME = liveassistant:global
-
-SPELLING_PROPERTIES = spelling/spelling.properties
diff --git a/core/src/main/resources/macros/TurbineMacros.vm b/core/src/main/resources/macros/TurbineMacros.vm
deleted file mode 100644
index bc978d374..000000000
--- a/core/src/main/resources/macros/TurbineMacros.vm
+++ /dev/null
@@ -1,111 +0,0 @@
-## ====================================================================
-##  The Apache Software License, Version 1.1
-## 
-##  Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
-##  reserved.
-## 
-##  Redistribution and use in source and binary forms, with or without
-##  modification, are permitted provided that the following conditions
-##  are met:
-## 
-##  1. Redistributions of source code must retain the above copyright
-##     notice, this list of conditions and the following disclaimer.
-## 
-##  2. Redistributions in binary form must reproduce the above copyright
-##     notice, this list of conditions and the following disclaimer in
-##     the documentation and/or other materials provided with the
-##     distribution.
-## 
-##  3. The end-user documentation included with the redistribution,
-##     if any, must include the following acknowledgment:
-##        "This product includes software developed by the
-##         Apache Software Foundation (http://www.apache.org/)."
-##     Alternately, this acknowledgment may appear in the software itself,
-##     if and wherever such third-party acknowledgments normally appear.
-## 
-##  4. The names "Apache" and "Apache Software Foundation" and
-##     "Apache Turbine" must not be used to endorse or promote products
-##     derived from this software without prior written permission. For
-##     written permission, please contact apache@apache.org.
-## 
-##  5. Products derived from this software may not be called "Apache",
-##     "Apache Turbine", nor may "Apache" appear in their name, without
-##     prior written permission of the Apache Software Foundation.
-## 
-##  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-##  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-##  OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-##  DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
-##  ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-##  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-##  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-##  USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-##  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-##  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-##  OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-##  SUCH DAMAGE.
-##  ====================================================================
-## 
-##  This software consists of voluntary contributions made by many
-##  individuals on behalf of the Apache Software Foundation.  For more
-##  information on the Apache Software Foundation, please see
-##  <http://www.apache.org/>.
-##
-## @author <a href="mailto:hps@intermeta.de">Henning P. Schmiedehausen</a>
-## @version $Id: TurbineMacros.vm 18715 2005-04-05 17:10:46 -0700 (Tue, 05 Apr 2005) bill $
-
-##
-## Build the <head> ... </head> tag of a web page with VelocityOnly Layout
-## 
-
-#macro (TurbineHtmlHead)
-<head>
-  #if ($!page.Title)
-    <title>$page.Title</title>
-  #end
-  #if ($page.MetaTags.size() > 0)
-    #foreach($metaTag in $page.MetaTags.keySet())
-      <meta name="$metaTag" content="$page.MetaTags.get($metaTag)">
-    #end
-  #end
-  #if ($page.HttpEquivs.size() > 0)
-    #foreach($httpEquiv in $page.HttpEquivs.keySet())
-      <meta http-equiv="$httpEquiv" content="$page.HttpEquivs.get($httpEquiv)">
-    #end
-  #end
-  #if ($page.StyleSheets.size() > 0)
-    #foreach( $styleSheet in $page.StyleSheets )
-      <link rel="stylesheet" href="$styleSheet.Url"
-        #if($!styleSheet.Type)  type="$styleSheet.Type"   #end
-        #if($!styleSheet.Media) media="$styleSheet.Media" #end
-        #if($!styleSheet.Title) title="$styleSheet.Title" #end
-      >
-    #end
-  #end
-  #if ($page.Styles.size() > 0)
-      <style type="text/css">
-    #foreach( $style in $page.Styles )
-        $!style
-    #end
-      </style>
-  #end
-  #if ($page.Scripts.size() > 0)
-    #foreach( $script in $page.Scripts )
-      <script type="text/javascript" src="$script" language="JavaScript"></script>
-    #end
-  #end
-</head>
-#end
-
-##
-## Build the Tags for the Body start tag of a web page with VelocityOnly Layout
-## <body #TurbineHtmlBodyAttributes() >
-## 
-
-#macro (TurbineHtmlBodyAttributes)
-#if ($page.BodyAttributes.size() > 0)
-    #foreach( $attributeName in $page.BodyAttributes.keySet() )
-      $attributeName = "$page.BodyAttributes.get($attributeName)"
-    #end
-#end
-#end