--- a/ckanext/example/forms.py
+++ b/ckanext/example/forms.py
@@ -7,13 +7,13 @@
 from ckan.logic.schema import package_form_schema, group_form_schema
 from ckan.lib.base import c, model
 from ckan.plugins import IDatasetForm, IGroupForm, IConfigurer
-from ckan.plugins import IGenshiStreamFilter
 from ckan.plugins import implements, SingletonPlugin
 from ckan.lib.navl.validators import ignore_missing, keep_extras
 
 log = logging.getLogger(__name__)
 
-EXAMPLE_VOCAB = u'example_vocab'
+GENRE_VOCAB = u'genre_vocab'
+COMPOSER_VOCAB = u'composer_vocab'
 
 
 class ExampleGroupForm(SingletonPlugin):
@@ -121,7 +121,6 @@
     """
     implements(IDatasetForm, inherit=True)
     implements(IConfigurer, inherit=True)    
-    implements(IGenshiStreamFilter)
     
     def update_config(self, config):
         """
@@ -135,40 +134,6 @@
         config['extra_template_paths'] = ','.join([template_dir,
                 config.get('extra_template_paths', '')])
 
-    # def configure(self, config):
-    #     '''
-    #     Adds some new vocabularies to the database if they don't already exist.
-
-    #     '''
-    #     # Add a 'genre' vocabulary with some tags.
-    #     self.genre_vocab = model.Vocabulary.get('Genre')
-    #     if not self.genre_vocab:
-    #         log.info("Adding vocab Genre")
-    #         self.genre_vocab = model.Vocabulary('Genre')
-    #         model.Session.add(self.genre_vocab)
-    #         model.Session.commit()
-    #         log.info("Adding example tags to vocab %s" % self.genre_vocab.name)
-    #         jazz_tag = model.Tag('jazz', self.genre_vocab.id)
-    #         soul_tag = model.Tag('soul', self.genre_vocab.id)
-    #         model.Session.add(jazz_tag)
-    #         model.Session.add(soul_tag)
-    #         model.Session.commit()
-
-    #     # Add a 'composer' vocabulary with some tags.
-    #     self.composer_vocab = model.Vocabulary.get('Composer')
-    #     if not self.composer_vocab:
-    #         log.info("Adding vocab Composer")
-    #         self.composer_vocab = model.Vocabulary('Composer')
-    #         model.Session.add(self.composer_vocab)
-    #         model.Session.commit()
-    #         log.info("Adding example tags to vocab %s" %
-    #                 self.composer_vocab.name)
-    #         mintzer_tag = model.Tag('Bob Mintzer', self.composer_vocab.id)
-    #         lewis_tag = model.Tag('Steve Lewis', self.composer_vocab.id)
-    #         model.Session.add(mintzer_tag)
-    #         model.Session.add(lewis_tag)
-    #         model.Session.commit()
-
     def package_form(self):
         """
         Returns a string representing the location of the template to be
@@ -209,11 +174,11 @@
         c.is_sysadmin = Authorizer().is_sysadmin(c.user)
         c.resource_columns = model.Resource.get_columns()
         try:
-            c.vocab_tags = get_action('tag_list')(context, {'vocabulary_id': EXAMPLE_VOCAB})
-            # c.genre_tags = get_action('tag_list')(context, {'vocabulary_id': self.genre_vocab.name})
-            # c.composer_tags = get_action('tag_list')(context, {'vocabulary_id': self.composer_vocab.name})
+            c.genre_tags = get_action('tag_list')(context, {'vocabulary_id': GENRE_VOCAB})
+            c.composer_tags = get_action('tag_list')(context, {'vocabulary_id': COMPOSER_VOCAB})
         except NotFound:
             c.vocab_tags = None
+            c.composer_tags = None
 
         ## This is messy as auths take domain object not data_dict
         pkg = context.get('package') or c.pkg
@@ -229,9 +194,8 @@
         schema = package_form_schema()
         schema.update({
             'published_by': [ignore_missing, unicode, convert_to_extras],
-            'vocab_tags': [ignore_missing, convert_to_tags(EXAMPLE_VOCAB)],
-            # 'genre_tags': [ignore_missing, convert_to_tags(self.genre_vocab.name)],
-            # 'composer_tags': [ignore_missing, convert_to_tags(self.composer_vocab.name)],
+            'genre_tags': [ignore_missing, convert_to_tags(GENRE_VOCAB)],
+            'composer_tags': [ignore_missing, convert_to_tags(COMPOSER_VOCAB)]
         })
         return schema
     
@@ -245,11 +209,12 @@
             'tags': {
                 '__extras': [keep_extras, free_tags_only]
             },
-            'vocab_tags_selected': [convert_from_tags(EXAMPLE_VOCAB), ignore_missing],
-            # 'genre_tags_selected': [convert_from_tags(self.genre_vocab.name),
-            #     ignore_missing],
-            # 'composer_tags_selected': [
-            #     convert_from_tags(self.composer_vocab.name), ignore_missing],
+            'genre_tags_selected': [
+                convert_from_tags(GENRE_VOCAB), ignore_missing
+            ],
+            'composer_tags_selected': [
+                convert_from_tags(COMPOSER_VOCAB), ignore_missing
+            ],
             'published_by': [convert_from_extras, ignore_missing],
         })
         return schema
@@ -259,9 +224,6 @@
         Check if the return data is correct and raises a DataError if not.
         """
         return
-
-    def filter(self, stream):
-        return stream
 
     # def filter(self, stream):
     #     # Add vocab tags to the bottom of the sidebar.