diff --git a/webservice/atompub/cmis/NavigationService.inc.php b/webservice/atompub/cmis/NavigationService.inc.php
deleted file mode 100644
index fe47e18..0000000
--- a/webservice/atompub/cmis/NavigationService.inc.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-
-require_once KT_LIB_DIR . '/api/ktcmis/ktcmis.inc.php';
-
-/**
- * CMIS Service class which hooks into the KnowledgeTree interface
- * for processing of CMIS queries and responses via atompub/webservices
- */
-
-class NavigationService extends KTNavigationService {
-
-    /**
-     * Get descendents of the specified folder, up to the depth indicated
-     *
-     * @param string $repositoryId
-     * @param string $folderId
-     * @param boolean $includeAllowableActions
-     * @param boolean $includeRelationships
-     * @param string $typeID
-     * @param int $depth
-     * @param string $filter
-     * @return cmisObjectType[]
-     */
-    public function getDescendants($repositoryId, $folderId, $includeAllowableActions, $includeRelationships,
-                                   $depth = 1, $typeID = 'Any', $filter = '')
-    {
-        $result = parent::getDescendants($repositoryId, $folderId, $includeAllowableActions,
-                                         $includeRelationships, $depth, $typeID, $filter);
-
-        if ($result['status_code'] == 0)
-        {
-            return $result['results'];
-        }
-    }
-
-    /**
-     * Get direct children of the specified folder
-     *
-     * @param string $repositoryId
-     * @param string $folderId
-     * @param boolean $includeAllowableActions
-     * @param boolean $includeRelationships
-     * @param string $typeID
-     * @param string $filter
-     * @param int $maxItems
-     * @param int $skipCount
-     * @return cmisObjectType[]
-     */
-    public function getChildren($repositoryId, $folderId, $includeAllowableActions, $includeRelationships,
-                         $typeID = 'Any', $filter = '', $maxItems = 0, $skipCount = 0)
-    {
-        $result =  parent::getChildren($repositoryId, $folderId, $includeAllowableActions, $includeRelationships,
-                                       $typeID, $filter, $maxItems, $skipCount);
-
-        if ($result['status_code'] == 0)
-        {
-            return $result['results'];
-        }
-    }
-
-    /**
-     * Gets the parent of the selected folder
-     *
-     * @param string $repositoryId
-     * @param string $folderId
-     * @param boolean $includeAllowableActions
-     * @param boolean $includeRelationships
-     * @param boolean $returnToRoot
-     * @param string $filter
-     * @return cmisObjectType[]
-     */
-    public function getFolderParent($repositoryId, $folderId, $includeAllowableActions, $includeRelationships, $returnToRoot, $filter = '')
-    {
-        $result = parent::getFolderParent($repositoryId, $folderId, $includeAllowableActions, $includeRelationships, $returnToRoot, $filter);
-
-        if ($result['status_code'] == 0)
-        {
-            return $result['results'];
-        }
-    }
-
-    /**
-     * Gets the parents for the selected object
-     *
-     * @param string $repositoryId
-     * @param string $folderId
-     * @param boolean $includeAllowableActions
-     * @param boolean $includeRelationships
-     * @param string $filter
-     * @return cmisObjectType[]
-     */
-    public function getObjectParents($repositoryId, $objectId, $includeAllowableActions, $includeRelationships, $filter = '')
-    {
-        $result = parent::getObjectParents($repositoryId, $objectId, $includeAllowableActions, $includeRelationships, $filter);
-
-        if ($result['status_code'] == 0)
-        {
-            return $result['results'];
-        }
-    }
-
-    /**
-     * Returns a list of checked out documents from the selected repository
-     *
-     * @param string $repositoryId
-     * @param string $folderId The folder for which checked out docs are requested
-     * @param string $filter
-     * @param int $maxItems
-     * @param int $skipCount
-     * @return array $checkedout The collection of checked out documents
-     */
-    function getCheckedoutDocs($repositoryId, $folderId = null, $filter = '', $maxItems = 0, $skipCount = 0)
-    {
-        $checkedout = parent::getObjectParents($repositoryId, $folderId, $filter, $maxItems, $skipCount);
-
-        if ($result['status_code'] == 0)
-        {
-            return $result['results'];
-        }
-    }
-
-}
-
-?>
diff --git a/webservice/atompub/cmis/ObjectFeed.inc.php b/webservice/atompub/cmis/ObjectFeed.inc.php
deleted file mode 100644
index 5c8d4f4..0000000
--- a/webservice/atompub/cmis/ObjectFeed.inc.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-
-class CMISObjectFeed {
-
-    /**
-     * Creates an AtomPub entry for a CMIS entry and adds it to the supplied feed
-     *
-     * @param object $feed The feed to which we add the entry
-     * @param array $cmisEntry The entry data
-     * @param string $parent The parent folder
-     */
-    static public function createEntry(&$feed, $cmisEntry, $parent, $path)
-    {
-        preg_match('/^\/?cmis\/folder\/(.*)\/[^\/]*\/?$/', trim($_SERVER['QUERY_STRING'], '/'), $matches);
-        $path = $matches[1];
-        $parent = preg_replace('/\/[^\/]*$/', '', $path);
-        
-        $entry = $feed->newEntry();
-        $feed->newId('urn:uuid:' . $cmisEntry['properties']['Name']['value'] . '-'
-                                 . strtolower($cmisEntry['properties']['ObjectTypeId']['value']), $entry);
-
-                        /*
-<link rel="edit" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/e98319fa-76e4-478f-8ce8-a3a0fd683e2c"/>
-<link rel="cmis-allowableactions" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/e98319fa-76e4-478f-8ce8-a3a0fd683e2c/permissions"/>
-<link rel="cmis-relationships" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/e98319fa-76e4-478f-8ce8-a3a0fd683e2c/associations"/>
-                         */
-
-        // links
-//            $link = $feed->newElement('link');
-//            $link->appendChild($feed->newAttr('rel','self'));
-//            $link->appendChild($feed->newAttr('href', CMIS_BASE_URI . strtolower($cmisEntry['properties']['ObjectTypeId']['value'])
-//                                                                    . '/' . $cmisEntry['properties']['ObjectId']['value']));
-//            $entry->appendChild($link);
-        $link = $feed->newElement('link');
-        $link->appendChild($feed->newAttr('rel','cmis-parent'));
-        $link->appendChild($feed->newAttr('href', CMIS_BASE_URI . 'folder/' . $path));
-        $entry->appendChild($link);
-
-        if (strtolower($cmisEntry['properties']['ObjectTypeId']['value']) == 'folder')
-        {
-            $link = $feed->newElement('link');
-            $link->appendChild($feed->newAttr('rel','cmis-folderparent'));
-            $link->appendChild($feed->newAttr('href', CMIS_BASE_URI . 'folder/' . $path));
-            $entry->appendChild($link);
-            $link = $feed->newElement('link');
-            $link->appendChild($feed->newAttr('rel','cmis-children'));
-            $link->appendChild($feed->newAttr('href', CMIS_BASE_URI
-                                                    . strtolower($cmisEntry['properties']['ObjectTypeId']['value'])
-                                                    . '/' . $path . '/' . urlencode($cmisEntry['properties']['Name']['value'])
-                                                    . '/children'));
-            $entry->appendChild($link);
-            $link = $feed->newElement('link');
-            $link->appendChild($feed->newAttr('rel','cmis-descendants'));
-            $link->appendChild($feed->newAttr('href', CMIS_BASE_URI
-                                                    . strtolower($cmisEntry['properties']['ObjectTypeId']['value'])
-                                                    . '/' . $path . '/' . urlencode($cmisEntry['properties']['Name']['value']) 
-                                                    . '/descendants'));
-            $entry->appendChild($link);
-        }
-
-        $link = $feed->newElement('link');
-        $link->appendChild($feed->newAttr('rel','cmis-type'));
-        $link->appendChild($feed->newAttr('href', CMIS_BASE_URI . 'type/' . strtolower($cmisEntry['properties']['ObjectTypeId']['value'])));
-        $entry->appendChild($link);
-        $link = $feed->newElement('link');
-        $link->appendChild($feed->newAttr('rel','cmis-repository'));
-        $link->appendChild($feed->newAttr('href', CMIS_BASE_URI . 'repository'));
-        $entry->appendChild($link);
-        // end links
-
-        $entry->appendChild($feed->newElement('summary', $cmisEntry['properties']['Name']['value']));
-        $entry->appendChild($feed->newElement('title', $cmisEntry['properties']['Name']['value']));
-
-        // main CMIS entry
-        $objectElement = $feed->newElement('cmis:object');
-        $propertiesElement = $feed->newElement('cmis:properties');
-
-        foreach($cmisEntry['properties'] as $propertyName => $property)
-        {
-            $propElement = $feed->newElement('cmis:' . $property['type']);
-            $propElement->appendChild($feed->newAttr('cmis:name', $propertyName));
-            $feed->newField('value', CMISUtil::boolToString($property['value']), $propElement);
-            $propertiesElement->appendChild($propElement);
-        }
-
-        $objectElement->appendChild($propertiesElement);
-        $entry->appendChild($objectElement);
-    }
-
-}
-
-?>
diff --git a/webservice/atompub/cmis/ObjectService.inc.php b/webservice/atompub/cmis/ObjectService.inc.php
deleted file mode 100644
index 728de1f..0000000
--- a/webservice/atompub/cmis/ObjectService.inc.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-require_once KT_LIB_DIR . '/api/ktcmis/ktcmis.inc.php';
-
-/**
- * CMIS Service class which hooks into the KnowledgeTree interface
- * for processing of CMIS queries and responses via atompub/webservices
- */
-
-class ObjectService extends KTObjectService {
-
-    /**
-     * Fetches the properties for the specified object
-     *
-     * @param string $repositoryId
-     * @param string $objectId
-     * @param boolean $includeAllowableActions
-     * @param boolean $includeRelationships
-     * @param boolean $returnVersion
-     * @param string $filter
-     * @return object CMIS object properties
-     */
-    public function getProperties($repositoryId, $objectId, $includeAllowableActions, $includeRelationships,
-                                  $returnVersion = false, $filter = '')
-    {
-        $result = parent::getProperties($repositoryId, $objectId, $includeAllowableActions,
-                                        $returnVersion, $filter);
-
-        if ($result['status_code'] == 0)
-        {
-            return $result['results'];
-        }
-    }
-
-}
-
-?>
diff --git a/webservice/atompub/cmis/RepositoryService.inc.php b/webservice/atompub/cmis/RepositoryService.inc.php
deleted file mode 100644
index 55a3a80..0000000
--- a/webservice/atompub/cmis/RepositoryService.inc.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-/**
- * CMIS Service class which hooks into the KnowledgeTree interface
- * for processing of CMIS queries and responses via atompub/webservices
- */
-
-require_once KT_LIB_DIR . '/api/ktcmis/ktcmis.inc.php';
-
-class RepositoryService extends KTRepositoryService {
-
-    /**
-    * Fetches a list of available repositories
-    *
-    * @return cmisRepositoryEntryType[]
-    */
-    public function getRepositories()
-    {
-        $result = parent::getRepositories();
-
-        if ($result['status_code'] == 0)
-        {
-            return $result['results'];
-        }
-    }
-
-    /**
-     * Fetches information about the selected repository
-     *
-     * @param string $repositoryId
-     * @return cmisRepositoryInfoType
-     */
-    public function getRepositoryInfo($repositoryId)
-    {
-        $result = parent::getRepositoryInfo($repositoryId);
-
-        if ($result['status_code'] == 0)
-        {
-            return $result['results'];
-        }
-    }
-
-    /**
-     * Fetch the list of supported object types for the selected repository
-     *
-     * @param string $repositoryId The ID of the repository for which object types must be returned
-     * @param string $typeId The type to return, ALL if not set
-     * @param boolean $returnPropertyDefinitions Return property definitions as well if TRUE
-     * @param int $maxItems The maximum number of items to return
-     * @param int $skipCount The number of items to skip before starting to return results
-     * @param boolean $hasMoreItems TRUE if there are more items to return than were requested
-     * @return cmisTypeDefinitionType[]
-     */
-    public function getTypes($repositoryId, $typeId = '', $returnPropertyDefinitions = false,
-                      $maxItems = 0, $skipCount = 0, &$hasMoreItems = false)
-    {
-        $result = parent::getTypes($repositoryId, $typeId, $returnPropertyDefinitions,
-                                $maxItems, $skipCount, $hasMoreItems);
-
-        if ($result['status_code'] == 0)
-        {
-            return $result['results'];
-        }
-    }
-
-    /**
-     * Fetch the object type definition for the requested type
-     *
-     * @param string $repositoryId
-     * @param string $typeId
-     * @return cmisTypeDefinitionType
-     */
-    public function getTypeDefinition($repositoryId, $typeId)
-    {
-        $result = parent::getTypeDefinition($repositoryId, $typeId);
-
-        if ($result['status_code'] == 0)
-        {
-            return $result['results'];
-        }
-    }
-
-}
-
-?>