diff --git a/plugins/libkolab/lib/kolab_format_configuration.php b/plugins/libkolab/lib/kolab_format_configuration.php
index edf22f7e..a099c59d 100644
--- a/plugins/libkolab/lib/kolab_format_configuration.php
+++ b/plugins/libkolab/lib/kolab_format_configuration.php
@@ -1,126 +1,107 @@
 <?php
 
 /**
  * Kolab Configuration data model class
  *
  * @version @package_version@
  * @author Thomas Bruederli <bruederli@kolabsys.com>
  *
  * Copyright (C) 2012, Kolab Systems AG <contact@kolabsys.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
  * published by the Free Software Foundation, either version 3 of the
  * License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 class kolab_format_configuration extends kolab_format
 {
     public $CTYPE = 'application/x-vnd.kolab.configuration';
 
     protected $xmltype = 'configuration';
 
-    private $type_map = array(
-        'dictionary' => Configuration::TypeDictionary,
-        'category' => Configuration::TypeCategoryColor,
-    );
-
-
     /**
      * Set properties to the kolabformat object
      *
      * @param array  Object data as hash array
      */
     public function set(&$object)
     {
         $this->init();
 
         if ($object['type'])
             $this->subtype = $object['type'];
 
-        // read type-specific properties
-        switch ($this->subtype) {
-        case 'dictionary':
-            // TODO: implement this
-            break;
-
-        case 'category':
-            // TODO: implement this
-            break;
-        default:
-            return false;
-        }
-
         // adjust content-type string
         $this->CTYPE = 'application/x-vnd.kolab.configuration.' . $this->subtype;
 
         // cache this data
         $this->data = $this->kolab_object = $object;
         unset($this->data['_formatobj']);
     }
 
     /**
      *
      */
     public function is_valid()
     {
         return $this->data || (is_object($this->obj) && $this->obj->isValid());
     }
 
     /**
      * Convert the Configuration object into a hash array data structure
      *
      * @return array  Config object data as hash array
      */
     public function to_array()
     {
         // load from XML if not done yet
         if (!empty($this->data))
             $this->init();
 
         // adjust content-type string
         if ($this->data['type']) {
             $this->subtype = $this->data;
             $this->CTYPE = 'application/x-vnd.kolab.configuration.' . $this->subtype;
         }
 
         return $this->data;
     }
 
     /**
      * Load data from old Kolab2 format
      */
     public function fromkolab2($record)
     {
         $object = array(
             'uid'     => $record['uid'],
             'changed' => $record['last-modification-date'],
         );
 
         $this->data = $object + $record;
     }
 
     /**
      * Callback for kolab_storage_cache to get object specific tags to cache
      *
      * @return array List of tags to save in cache
      */
     public function get_tags()
     {
         $tags = array();
 
         if ($this->data['type'] == 'dictionary')
             $tags = array($this->data['language']);
 
         return $tags;
     }
 
 }