diff --git a/OPSI/control b/OPSI/control
index a279055..9b36330 100644
--- a/OPSI/control
+++ b/OPSI/control
@@ -30,9 +30,3 @@ description: which architecture (32/64 bit) has to be installed
 values: ["32 only", "64 only", "both", "system specific"]
 default: ["system specific"]
 
-[ProductDependency]
-action: setup
-requiredProduct: aio
-requiredStatus: installed
-requirementType: before
-
diff --git a/Testing.txt b/Testing.txt
new file mode 100644
index 0000000..c893097
--- /dev/null
+++ b/Testing.txt
@@ -0,0 +1,29 @@
+*** Qualitiymanagement / testing protocol
+
+- Product:
+        - Name: tmviewer
+        - Version: xxx
+        - Release: yyyy
+
+- Environment
+        - OS: Native windows XP-32Bit installation
+	- Preinstalled packages: None (also no aio)
+	- Files used while testing:
+                File1: http://www.brad.ac.uk/learner-development/media/LearnerDevelopmentUnit/Documents/AcademicSkillsResources/PresentationSkills/Presentation-Practice-Slides-Activity.docx
+                (http://www.brad.ac.uk/learner-development/resources/study/present/)
+
+- Testing process:
+        OPSI-action:
+                - Installation (without dependencies like AIO/Firefox): ok
+        Result:   
+                - File extensions related to program: ok
+                - Start menu entry: ok
+                - Starting/using program: viewer works, File1 is shown correctly: ok
+
+        OPSI-action:
+                - Uninstall
+        Result:
+                - File extensions related to program: unrelated: ok
+                - Start menu entry: none: ok
+
+
diff --git a/builder-product.cfg b/builder-product.cfg
index 2a55931..4fff7cd 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -3,7 +3,7 @@
 ############################
 VENDOR="softmaker.de"
 PN="tmviewer"
-VERSION="2010"
+VERSION="2010.rev591"
 RELEASE="10"
 PRIORITY="0"
 ADVICE=""
diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh
index a7a2987..c5c623c 100644
--- a/builder-targets-cb.sh
+++ b/builder-targets-cb.sh
@@ -19,46 +19,7 @@
 #
 ##############################################################################
 
-#function config() {
-#    echo "Config - doing some commands before calling the builder_config" 
-#    builder_config
-#    echo "Config - doing some commands after calling the builder_config" 
-#}
-
-#function prepare() { 
-#    echo "Prepare" 
-#    builder_prepare
-#}
-
-function retrieve() { 
-    echo "Retrieve" 
-    builder_retrieve
-}
-
-function create() { 
-    echo  "Create"
-    builder_create
-}
-
-function package() { 
-    echo "Package" 
-    builder_package
-}
-
-function publish() {
-    echo "Publish"
-    builder_publish
-}
-
-function commit() {
-    echo "Commit"
-     builder_commit
-}
 function cleanup() {
     echo "Cleanup: output_dir: $OUTPUT_DIR"
-#    cp -a ${OUTPUT_DIR}/${OPSI_REPOS_FILE_PATTERN}.opsi /tmp/tmviewer.opsi
-#    chmod 666 /tmp/tmviewer.opsi
-#    ls -altr /tmp/tmviewer.opsi
-
-     builder_cleanup
+    builder_cleanup
 }