diff --git a/webservice/classes/atompub/cmis/NavigationService.inc.php b/webservice/classes/atompub/cmis/NavigationService.inc.php
deleted file mode 100644
index 0be43c9..0000000
--- a/webservice/classes/atompub/cmis/NavigationService.inc.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-
-require_once KT_LIB_DIR . '/api/ktcmis/ktNavigationService.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'];
-        }
-        else {
-            return new PEAR_Error($result['message']);
-        }
-    }
-
-    /**
-     * 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)
-    {
-        $result = parent::getCheckedOutDocs($repositoryId, $folderId, $filter, $maxItems, $skipCount);
-
-        if ($result['status_code'] == 0)
-        {
-            return $result['results'];
-        }
-    }
-
-}
-
-?>
diff --git a/webservice/classes/atompub/cmis/ObjectService.inc.php b/webservice/classes/atompub/cmis/ObjectService.inc.php
deleted file mode 100644
index 886ac60..0000000
--- a/webservice/classes/atompub/cmis/ObjectService.inc.php
+++ /dev/null
@@ -1,177 +0,0 @@
-<?php
-
-require_once KT_LIB_DIR . '/api/ktcmis/ktObjectService.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'];
-        }
-        else {
-            return new PEAR_Error($result['message']);
-        }
-    }
-
-    /**
-     * Creates a new document within the repository
-     *
-     * @param string $repositoryId The repository to which the document must be added
-     * @param array $properties Array of properties which must be applied to the created document object
-     * @param string $folderId The id of the folder which will be the parent of the created document object
-     *                         This parameter is optional IF unfilingCapability is supported
-     * @param string $contentStream optional content stream data - expected as a base64 encoded string
-     * @param string $versioningState optional version state value: none/checkedout/major/minor
-     * @param $policies List of policy ids that MUST be applied
-     * @param $addACEs List of ACEs that MUST be added
-     * @param $removeACEs List of ACEs that MUST be removed
-     * @return string $objectId The id of the created folder object
-     */
-    public function createDocument($repositoryId, $properties, $folderId = null, $contentStream = null, 
-                                   $versioningState = 'none', $policies = array(), $addACEs = array(), 
-                                   $removeACEs = array())
-    {
-        $result = parent::createDocument($repositoryId, $properties, $folderId, $contentStream, $versioningState, 
-                                         $policies, $addACEs, $removeACEs);
-                                         
-        if ($result['status_code'] == 0) {
-            return $result['results'];
-        }
-        else {
-            return new PEAR_Error($result['message']);
-        }
-    }
-
-    /**
-     * Creates a new folder within the repository
-     *
-     * @param string $repositoryId The repository to which the folder must be added
-     * @param string $typeId Object Type id for the folder object being created
-     * @param array $properties Array of properties which must be applied to the created folder object
-     * @param string $folderId The id of the folder which will be the parent of the created folder object
-     * @return string $objectId The id of the created folder object
-     */
-    public function createFolder($repositoryId, $typeId, $properties, $folderId)
-    {
-        $result = parent::createFolder($repositoryId, $typeId, $properties, $folderId);
-
-        if ($result['status_code'] == 0) {
-            return $result['results'];
-        }
-        else {
-            return new PEAR_Error($result['message']);
-        }
-    }
-    
-    /**
-     * Fetches the content stream data for an object
-     *  
-     * @param string $repositoryId
-     * @param string $objectId
-     * @param string $streamId [optional for documents] Specifies the rendition to retrieve if not original document
-     * @return string $contentStream (binary or text data)
-     */
-    function getContentStream($repositoryId, $objectId, $streamId = null)
-    {
-        $result = parent::getContentStream($repositoryId, $objectId, $streamId);
-
-        if ($result['status_code'] == 0) {
-            return $result['results'];
-        }
-        else {
-            return new PEAR_Error($result['message']);
-        }
-    }
-    
-    /**
-     * Moves a fileable object from one folder to another.
-     * 
-     * @param object $repositoryId
-     * @param object $objectId
-     * @param object $changeToken [optional]
-     * @param object $targetFolderId
-     * @param object $sourceFolderId [optional] 
-     */
-    public function moveObject($repositoryId, $objectId, $changeToken = '', $targetFolderId, $sourceFolderId = null)
-    {
-        $result = parent::moveObject($repositoryId, $objectId, $changeToken, $targetFolderId, $sourceFolderId);
-
-        if ($result['status_code'] == 0) {
-            return $result['results'];
-        }
-        else {
-            return new PEAR_Error($result['message']);
-        }
-    }
-    
-    /**
-     * Deletes an object from the repository
-     * 
-     * @param string $repositoryId
-     * @param string $objectId
-     * @param string $changeToken [optional]
-     * @return boolean true on success, false on failure
-     */
-    // NOTE Invoking this service method on an object SHALL not delete the entire version series for a Document Object. 
-    //      To delete an entire version series, use the deleteAllVersions() service
-    public function deleteObject($repositoryId, $objectId, $changeToken = null)
-    {
-        $result = parent::deleteObject($repositoryId, $objectId, $changeToken);
-
-        if ($result['status_code'] == 0) {
-            return $result['results'];
-        }
-        else {
-            return new PEAR_Error($result['message']);
-        }
-    }
-    
-    /**
-     * Deletes an entire tree including all subfolders and other filed objects
-     * 
-     * @param string $repositoryId
-     * @param string $objectId
-     * @param string $changeToken [optional]
-     * @param boolean $unfileNonfolderObject [optional] - note that since KnowledgeTree does not allow unfiling this will be ignored
-     * @param boolean $continueOnFailure [optional] - note that since KnowledgeTree does not allow continue on failure this will be ignored
-     * @return array $failedToDelete A list of identifiers of objects in the folder tree that were not deleted.
-     */
-    public function deleteTree($repositoryId, $objectId, $changeToken = null, $unfileNonfolderObject = 'delete', $continueOnFailure = false)
-    {
-        $result = parent::deleteTree($repositoryId, $objectId, $changeToken, $unfileNonfolderObject, $continueOnFailure);
-
-        if ($result['status_code'] == 0) {
-            return $result['results'];
-        }
-        else if (is_array($result['message'])) {
-            return $result['message'];
-        }
-        else {
-            return new PEAR_Error($result['message']);
-        }
-    }
-
-}
-
-?>
diff --git a/webservice/classes/atompub/cmis/RepositoryService.inc.php b/webservice/classes/atompub/cmis/RepositoryService.inc.php
deleted file mode 100644
index c763eb3..0000000
--- a/webservice/classes/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/ktRepositoryService.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'];
-        }
-    }
-
-}
-
-?>